Fix Link/Multilink searching

.. for the case that a key property may contain numeric values.
This already was correct for menu (in an item template) but was doing
the wrong thing for index templates.

Author: schlatterbeck

CHANGES.txt

@@ -161,6 +161,11 @@ Fixed:
   dictionary in some cases where a single key should have been used.
   Thanks to Robert Klonner for discovering the problem, debugging the
   root cause and providing a first proposed fix.
+- Make searching with a multiselect work for Link/Multilink properties
+  that may contain numeric *key* values. For these a menu would render
+  options with IDs and later look up the IDs as *key* of the
+  Link/Multilink. Now numeric IDs take precedence -- like they already
+  do in the menu method of Link and Multilink.
 
 2018-07-13 1.6.0
 

roundup/cgi/templating.py

@@ -384,6 +384,10 @@ def lookupIds(db, prop, ids, fail_ok=0, num_re=num_re, do_lookup=True):
     cl = db.getclass(prop.classname)
     l = []
     for entry in ids:
+        # Do not look up numeric IDs
+        if num_re.match(entry):
+            l.append(entry)
+            continue
         if do_lookup:
             try:
                 item = cl.lookup(entry)
@@ -394,7 +398,7 @@ def lookupIds(db, prop, ids, fail_ok=0, num_re=num_re, do_lookup=True):
                 continue
         # if fail_ok, ignore lookup error
         # otherwise entry must be existing object id rather than key value
-        if fail_ok or num_re.match(entry):
+        if fail_ok:
             l.append(entry)
     return l