Support new sorting feature which user can specify order of sort explicitly.

product/ERP5Form/Tool/SelectionTool.py

@@ -515,6 +515,19 @@ class SelectionTool( BaseTool, SimpleItem ):
       if sort_on is None:
         listbox_id, sort_on = form["setSelectionQuickSortOrder"].split(".", 1)
 
+      # Sort order can be specified in sort_on.
+      forced_sort_order = None
+      if sort_on is not None:
+        if sort_on.endswith(':asc'):
+          forced_sort_order = 'ascending'
+          sort_on = sort_on[:-4]
+        elif sort_on.endswith(':desc'):
+          forced_sort_order = 'descending'
+          sort_on = sort_on[:-5]
+        elif sort_on.endswith(':none'):
+          forced_sort_order = 'none'
+          sort_on = sort_on[:-5]
+
       if REQUEST is not None:
         if listbox_id is not None:
             selection_name_key = "%s_list_selection_name" %listbox_id
@@ -524,22 +537,33 @@ class SelectionTool( BaseTool, SimpleItem ):
           
       selection = self.getSelectionFor(selection_name, REQUEST=REQUEST)
       if selection is not None:
-        current_sort_on = self.getSelectionSortOrder(selection_name)
-        # We must first switch from asc to desc and vice-versa if sort_order exists
-        # in selection
-        n = 0
-        for current in current_sort_on:
-          if current[0] == sort_on:
-            n = 1
-            if current[1] == 'ascending':
-              new_sort_on = [(sort_on, 'descending')]
-              break
-            else:
-              new_sort_on = [(sort_on,'ascending')]
-              break
-        # And if no one exists, we just set ascending sort
-        if n == 0:
-          new_sort_on = [(sort_on,'ascending')]
+        if forced_sort_order is not None:
+          if forced_sort_order == 'none':
+            temporary_new_sort_on = []
+          else:
+            temporary_new_sort_on = [(sort_on, forced_sort_order)]
+          # Allow user to sort by multiple columns
+          new_sort_on = [s
+                         for s in self.getSelectionSortOrder(selection_name)
+                         if s[0]!=sort_on]
+          new_sort_on.extend(temporary_new_sort_on)
+        else:
+          current_sort_on = self.getSelectionSortOrder(selection_name)
+          # We must first switch from asc to desc and vice-versa if sort_order exists
+          # in selection
+          n = 0
+          for current in current_sort_on:
+            if current[0] == sort_on:
+              n = 1
+              if current[1] == 'ascending':
+                new_sort_on = [(sort_on, 'descending')]
+                break
+              else:
+                new_sort_on = [(sort_on,'ascending')]
+                break
+          # And if no one exists, we just set sort
+          if n == 0:
+            new_sort_on = [(sort_on, 'ascending')]
         selection.edit(sort_on=new_sort_on)
 
       if REQUEST is not None: