Made error on create consistent with edit when user enters invalid data...

for Multilink and Link form fields [SF#904072]

Author: Richard Jones

CHANGES.txt

@@ -1,6 +1,12 @@
 This file contains the changes to the Roundup system over time. The entries
 are given with the most recent entry first.
 
+2004-02-25 0.6.7
+Fixed:
+- made error on create consistent with edit when user enters invalid data
+  for Multilink and Link form fields (sf bug 904072)
+
+
 2004-02-25 0.6.6
 Fixed:
 - don't insert spaces into designators, it just confuses users (sf bug

roundup/cgi/templating.py

@@ -247,7 +247,10 @@ def classes(self):
         l.sort()
         return [HTMLClass(self._client, cn) for cn in l]
 
-def lookupIds(db, prop, ids, num_re=re.compile('-?\d+')):
+def lookupIds(db, prop, ids, fail_ok=False, num_re=re.compile('-?\d+')):
+    ''' "fail_ok" should be specified if we wish to pass through bad values
+        (most likely form values that we wish to represent back to the user)
+    '''
     cl = db.getclass(prop.classname)
     l = []
     for entry in ids:
@@ -256,9 +259,10 @@ def lookupIds(db, prop, ids, num_re=re.compile('-?\d+')):
         else:
             try:
                 l.append(cl.lookup(entry))
-            except KeyError:
-                # ignore invalid keys
-                pass
+            except (TypeError, KeyError):
+                if fail_ok:
+                    # pass through the bad value
+                    l.append(entry)
     return l
 
 class HTMLPermissions:
@@ -316,11 +320,12 @@ def __getitem__(self, item):
             if form.has_key(item):
                 if isinstance(prop, hyperdb.Multilink):
                     value = lookupIds(self._db, prop,
-                        handleListCGIValue(form[item]))
+                        handleListCGIValue(form[item]), fail_ok=True)
                 elif isinstance(prop, hyperdb.Link):
                     value = form[item].value.strip()
                     if value:
-                        value = lookupIds(self._db, prop, [value])[0]
+                        value = lookupIds(self._db, prop, [value],
+                            fail_ok=True)[0]
                     else:
                         value = None
                 else: