Fix issue2551122 (MultilinkHTMLProperty sorted method issue)

The sorted method of MultilinkHTMLProperty does a string sort even if
the property is an integer.

Fixed so that the orderprop for the linked class is used.

Author: rouilj

CHANGES.txt

@@ -116,6 +116,9 @@ Fixed:
   signature. Without these upgrades, ssl mode won't start. Note this
   exposes other issue with roundup-server operating as an SSL
   endpoint. See issue2551138 and issue2551137.
+- issue2551122 - sorted method of MultilinkHTMLProperty does a string
+  sort even if the property is an integer. Fixed so that the orderprop
+  for the linked class is used. (John Rouillard, reported by Nagy Gabor)
 
 Features:
 - issue2550522 - Add 'filter' command to command-line

doc/customizing.txt

@@ -3305,7 +3305,10 @@ sorted      only on Multilink properties - produce a list of the linked
             creation date at the start of the list. The default for
             ``NoneFirst`` is False so these files will sort at the end
             by default. (Note creation date is never unset, but you
-            get the idea.) 
+            get the idea.) If you combine NoneFirst with
+            ``reverse=True`` the meaning of NoneFirst is inverted:
+	    True sorts None/unset at the end and False sorts at the
+	    beginning.
 reverse     only on Multilink properties - produce a list of the linked
             items in reverse order
 isset       returns True if the property has been set to a value

roundup/cgi/templating.py

@@ -2624,19 +2624,31 @@ def sorted(self, property, reverse=False, NoneFirst=False):
         # 0 to sort to sort None first
         # 1 is used to sort the integer values.
         NoneCode = (2,0)[NoneFirst]
+
+        value = list(self.__iter__())
+
+        # determine orderprop for property.
+        if value: 
+            orderprop = value[0]._db.getclass(property).orderprop()
+        else: # return empty list, nothing to sort.
+            return value
+
         def keyfunc(v):
             # Return tuples made of (group order (int), base python
             # type) to sort function.
             # Do not return v[property] as that returns an HTMLProperty
             # type/subtype that throws an exception when sorting
             # python type (int. str ...) against None.
-            val = v[property]._value
-            if val:
-                return (1, val)  # val should be base python type
-            elif val is None:
+            prop = v[property]
+            if not prop._value:
                 return (NoneCode, None)
 
-        value = list(self.__iter__())
+            val = prop[orderprop]._value
+
+            if val is None: # verify orderprop is set to a value
+                return (NoneCode, None)
+            return (1, val)  # val should be base python type
+
         value.sort(key=keyfunc, reverse=reverse)
         return value