Commit 92e4fca3 authored by Vincent Pelletier's avatar Vincent Pelletier

Make getWorklistListQuery return python-usable list instead of pre-preocessed...

Make getWorklistListQuery return python-usable list instead of pre-preocessed select and group-by expressions.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17368 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent bda72309
...@@ -309,11 +309,8 @@ def getWorklistListQuery(grouped_worklist_dict): ...@@ -309,11 +309,8 @@ def getWorklistListQuery(grouped_worklist_dict):
query = generateNestedQuery(priority_list=total_criterion_id_list, query = generateNestedQuery(priority_list=total_criterion_id_list,
criterion_dict=total_criterion_id_dict) criterion_dict=total_criterion_id_dict)
assert query is not None assert query is not None
group_by_expression = ', '.join(total_criterion_id_list)
assert COUNT_COLUMN_TITLE not in total_criterion_id_dict assert COUNT_COLUMN_TITLE not in total_criterion_id_dict
select_expression = 'count(*) as %s, %s' % (COUNT_COLUMN_TITLE, return (total_criterion_id_list, query)
group_by_expression)
return (select_expression, group_by_expression, query)
def _ensemblistMultiply(ensemble_a, ensemble_b): def _ensemblistMultiply(ensemble_a, ensemble_b):
""" """
...@@ -489,8 +486,12 @@ def WorkflowTool_listActions(self, info=None, object=None): ...@@ -489,8 +486,12 @@ def WorkflowTool_listActions(self, info=None, object=None):
getSecurityUidListAndRoleColumnDict) getSecurityUidListAndRoleColumnDict)
for grouped_worklist_dict in worklist_list_grouped_by_condition: for grouped_worklist_dict in worklist_list_grouped_by_condition:
# Generate the query for this worklist_list # 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) 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, search_result_kw = {'select_expression': select_expression,
'group_by_expression': group_by_expression, 'group_by_expression': group_by_expression,
'query': query} 'query': query}
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment