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

[nobody at svn.erp5.org]

Author: vincent
Date: Fri Nov  2 17:30:36 2007
New Revision: 17368

URL: http://svn.erp5.org?rev=17368&view=rev
Log:
Make getWorklistListQuery return python-usable list instead of pre-preocessed select and group-by expressions.

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=17368&r1=17367&r2=17368&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/WorkflowTool.py (original)
+++ erp5/trunk/products/ERP5Type/patches/WorkflowTool.py Fri Nov  2 17:30:36 2007
@@ -309,11 +309,8 @@
   query = generateNestedQuery(priority_list=total_criterion_id_list,
                               criterion_dict=total_criterion_id_dict)
   assert query is not None
-  group_by_expression = ', '.join(total_criterion_id_list)
   assert COUNT_COLUMN_TITLE not in total_criterion_id_dict
-  select_expression = 'count(*) as %s, %s' % (COUNT_COLUMN_TITLE,
-                                              group_by_expression)
-  return (select_expression, group_by_expression, query)
+  return (total_criterion_id_list, query)
 
 def _ensemblistMultiply(ensemble_a, ensemble_b):
   """
@@ -489,8 +486,12 @@
             getSecurityUidListAndRoleColumnDict)
       for grouped_worklist_dict in worklist_list_grouped_by_condition:
         # Generate the query for this worklist_list
-        (select_expression, group_by_expression, query) = \
+        (total_criterion_id_list, query) = \
           getWorklistListQuery(grouped_worklist_dict=grouped_worklist_dict)
+        group_by_expression = ', '.join(total_criterion_id_list)
+        assert COUNT_COLUMN_TITLE not in total_criterion_id_list
+        select_expression = 'count(*) as %s, %s' % (COUNT_COLUMN_TITLE,
+                                                    group_by_expression)
         search_result_kw = {'select_expression': select_expression,
                             'group_by_expression': group_by_expression,
                             'query': query}