Commit c830c583 authored by Vincent Pelletier's avatar Vincent Pelletier

Transmit workflow_worklist_key to getValidCriterionDict to display it in error...

Transmit workflow_worklist_key to getValidCriterionDict to display it in error message. Fixes error message rendering causing other errors because of undefined names.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@17385 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 47905daa
...@@ -96,7 +96,8 @@ class ExclusionTuple(tuple): ...@@ -96,7 +96,8 @@ class ExclusionTuple(tuple):
""" """
pass pass
def getValidCriterionDict(worklist_match_dict, acceptable_key_dict): def getValidCriterionDict(worklist_match_dict, acceptable_key_dict,
workflow_worklist_key):
valid_criterion_dict = {} valid_criterion_dict = {}
metadata = None metadata = None
for criterion_id, criterion_value in worklist_match_dict.iteritems(): for criterion_id, criterion_value in worklist_match_dict.iteritems():
...@@ -110,10 +111,10 @@ def getValidCriterionDict(worklist_match_dict, acceptable_key_dict): ...@@ -110,10 +111,10 @@ def getValidCriterionDict(worklist_match_dict, acceptable_key_dict):
elif criterion_id == SECURITY_PARAMETER_ID: elif criterion_id == SECURITY_PARAMETER_ID:
pass pass
else: else:
LOG('WorkflowTool_listActions', WARNING, 'Worklist %s of ' \ LOG('WorkflowTool_listActions', WARNING, 'Worklist %s' \
'workflow %s filters on variable %s which is not available ' \ 'filters on variable %s which is not available ' \
'in catalog. Its value will not be checked.' % \ 'in catalog. Its value will not be checked.' % \
(worklist_id, workflow_id, criterion_id)) (workflow_worklist_key, criterion_id))
return valid_criterion_dict, metadata return valid_criterion_dict, metadata
def updateWorklistSetDict(worklist_set_dict, workflow_worklist_key, valid_criterion_dict): def updateWorklistSetDict(worklist_set_dict, workflow_worklist_key, valid_criterion_dict):
...@@ -167,7 +168,8 @@ def groupWorklistListByCondition(worklist_dict, acceptable_key_dict, ...@@ -167,7 +168,8 @@ def groupWorklistListByCondition(worklist_dict, acceptable_key_dict,
if getSecurityUidListAndRoleColumnDict is None: if getSecurityUidListAndRoleColumnDict is None:
valid_criterion_dict, metadata = getValidCriterionDict( valid_criterion_dict, metadata = getValidCriterionDict(
worklist_match_dict=worklist_match_dict, worklist_match_dict=worklist_match_dict,
acceptable_key_dict=acceptable_key_dict) acceptable_key_dict=acceptable_key_dict,
workflow_worklist_key=workflow_worklist_key)
if metadata is not None: if metadata is not None:
metadata_dict[workflow_worklist_key] = metadata metadata_dict[workflow_worklist_key] = metadata
updateWorklistSetDict( updateWorklistSetDict(
......
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