[Erp5-report] r31467 jp - /erp5/trunk/products/ERP5Form/Extensions/

[nobody at svn.erp5.org]

Author: jp
Date: Thu Dec 24 18:28:30 2009
New Revision: 31467

URL: http://svn.erp5.org?rev=31467&view=rev
Log:
Fix collateral damages. Take into account uids for filtered selection at the level of selection params. Sort results in a canonical way so that results are predicated, tests possible, and user feels better by havin results grouped by workflow and state always in the same order.

Modified:
    erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py

Modified: erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py?rev=31467&r1=31466&r2=31467&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py [utf8] (original)
+++ erp5/trunk/products/ERP5Form/Extensions/Folder_getWorkflowActionDocumentList.py [utf8] Thu Dec 24 18:28:30 2009
@@ -1,3 +1,4 @@
+# -*- coding: utf-8 -*-
 #############################################################################
 #
 # Copyright (c) 2007 Nexedi SA and Contributors. All Rights Reserved.
@@ -141,6 +142,13 @@
                 workflow_state=doc.getProperty(state_var),
                 ))
   
+  # Let us sort this list by translated title of workflow state and workflow
+  def compareState(a, b):
+    return cmp((a.workflow_title, a.translated_workflow_state_title),
+               (b.workflow_title, b.translated_workflow_state_title))
+  document_list.sort(compareState)
+
+  # Return result
   return document_list
 
 
@@ -163,9 +171,6 @@
 
   selection_uid_list = selection_tool.getSelectionCheckedUidsFor(selection_name)
 
-  if selection_uid_list:
-    original_selection_params['uid'] = selection_uid_list
-
   translate = self.Base_translateString
   for listbox_selection in listbox:
     if listbox_selection.get('workflow_action'):
@@ -174,6 +179,8 @@
       selection_params[listbox_selection['state_var']] = \
                                 listbox_selection['workflow_state']
       selection_params['portal_type'] = listbox_selection['portal_type']
+      if selection_uid_list:
+        selection_params['uid'] = selection_uid_list
 
       workflow_id, action = listbox_selection['workflow_action'].split('/')
       workflow = wtool.getWorkflowById(workflow_id)