[Erp5-report] r15470 - /erp5/trunk/products/ERP5Type/patches/WorkflowTool.py

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Aug  3 17:58:08 2007
New Revision: 15470

URL: http://svn.erp5.org?rev=15470&view=rev
Log:
Pendant of the nesting mistake: think about appending results of each pass.

Modified:
    erp5/trunk/products/ERP5Type/patches/WorkflowTool.py

Modified: erp5/trunk/products/ERP5Type/patches/WorkflowTool.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5Type/patches/WorkflowTool.py?rev=15470&r1=15469&r2=15470&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/WorkflowTool.py (original)
+++ erp5/trunk/products/ERP5Type/patches/WorkflowTool.py Fri Aug  3 17:58:08 2007
@@ -404,6 +404,7 @@
         security_query_cache_dict[security_cache_key] = query
       return query
     def _getWorklistActionList():
+      action_list = []
       acceptable_key_dict = portal_catalog.getSQLCatalog().getColumnMap()
       # Get a list of dict of WorklistVariableMatchDict grouped by compatible conditions
       worklist_list_grouped_by_condition = groupWorklistListByCondition(worklist_dict=worklist_dict, acceptable_key_dict=acceptable_key_dict)
@@ -421,8 +422,9 @@
         LOG('WorklistGeneration', BLATHER, '%s results' % (len(catalog_brain_result), ))
         worklist_result_dict = sumCatalogResultByWorklist(grouped_worklist_dict=grouped_worklist_dict, catalog_result=catalog_brain_result)
         LOG('WorklistGeneration', BLATHER, 'Distributed into %s worklists.'% (len(worklist_result_dict), ))
-        action_list = generateActionList(grouped_worklist_dict=grouped_worklist_dict, worklist_result=worklist_result_dict, portal_url=portal_url)
-        LOG('WorklistGeneration', BLATHER, 'Creating %s actions.' % (len(action_list), ))
+        group_action_list = generateActionList(grouped_worklist_dict=grouped_worklist_dict, worklist_result=worklist_result_dict, portal_url=portal_url)
+        LOG('WorklistGeneration', BLATHER, 'Creating %s actions.' % (len(group_action_list), ))
+        action_list.extend(group_action_list)
       return action_list
     user = str(_getAuthenticatedUser(self))
     _getWorklistActionList = CachingMethod(_getWorklistActionList, id=('_getWorklistActionList', user, portal_url), cache_factory = 'erp5_ui_short')