Do not set selection_sort_on to the default sort. use selection_default_sort_on instead.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@1339 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5Form/ListBox.py

@@ -402,28 +402,32 @@ class ListBoxWidget(Widget.Widget):
         selection = here.portal_selections.getSelectionFor(selection_name, REQUEST=REQUEST)
         # Create selection if needed, with default sort order
         if selection is None:
-          selection = Selection(params=default_params, sort_on = sort)
+          selection = Selection(params=default_params, default_sort_on = sort)
         # Or make sure all sort arguments are valid
         else:
           # Reset Selection is needed
           if reset is not 0 and reset is not '0':
             here.portal_selections.setSelectionToAll(selection_name)
-            here.portal_selections.setSelectionSortOrder(selection_name, sort_on = sort)
+            here.portal_selections.setSelectionSortOrder(selection_name, sort_on = [])
+
+          # Modify the default sort index every time, because it may change immediately.
+          selection.edit(default_sort_on = sort)
 
           # Filter non searchable items
-          sort = []
+          sort_list = []
           fix_sort = 0
           for (k , v) in selection.selection_sort_on:
             if k in sort_columns_id_list:
-              sort.append((k,v))
+              sort_list.append((k,v))
             else:
               fix_sort = 1
-          if fix_sort: selection.selection_sort_on = sort
+          if fix_sort: selection.selection_sort_on = sort_list
 
         if not hasattr(selection, 'selection_flat_list_mode'):
           selection.edit(flat_list_mode=(not (domain_tree or
            report_tree)),domain_tree_mode=domain_tree,report_tree_mode= report_tree)
 
+        #LOG('ListBox', 0, 'sort = %s, selection.selection_sort_on = %s' % (repr(sort), repr(selection.selection_sort_on)))
         # Selection
         #LOG("Selection",0,str(selection.__dict__))
 
@@ -599,7 +603,7 @@ class ListBoxWidget(Widget.Widget):
         else:
           stat_method = here.portal_catalog.countResults
 
-        LOG('ListBox', 0, 'domain_tree = %s, selection.getSelectionDomainPath() = %s, selection.getSelectionDomainList() = %s' % (repr(domain_tree), repr(selection.getSelectionDomainPath()), repr(selection.getSelectionDomainList())))
+        #LOG('ListBox', 0, 'domain_tree = %s, selection.getSelectionDomainPath() = %s, selection.getSelectionDomainList() = %s' % (repr(domain_tree), repr(selection.getSelectionDomainPath()), repr(selection.getSelectionDomainList())))
         if domain_tree:
           selection_domain_path = selection.getSelectionDomainPath()
           selection_domain_current = selection.getSelectionDomainList()
@@ -1395,6 +1399,7 @@ class ListBoxValidator(Validator.Validator):
         editable_column_ids = map(lambda x: x[0], editable_columns)
         all_editable_column_ids = map(lambda x: x[0], all_editable_columns)
         selection_name = field.get_value('selection_name')
+        #LOG('ListBoxValidator', 0, 'field = %s, selection_name = %s' % (repr(field), repr(selection_name)))
         selection = here.portal_selections.getSelectionFor(selection_name, REQUEST=REQUEST)
         params = selection.getSelectionParams()
         portal_url = getToolByName(here, 'portal_url')