[Erp5-report] r17385 - /erp5/trunk/products/ERP5Type/patches/WorkflowTool.py
nobody at svn.erp5.org
nobody at svn.erp5.org
Mon Nov 5 12:42:33 CET 2007
Author: vincent
Date: Mon Nov 5 12:42:32 2007
New Revision: 17385
URL: http://svn.erp5.org?rev=17385&view=rev
Log:
Transmit workflow_worklist_key to getValidCriterionDict to display it in error message. Fixes error message rendering causing other errors because of undefined names.
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=17385&r1=17384&r2=17385&view=diff
==============================================================================
--- erp5/trunk/products/ERP5Type/patches/WorkflowTool.py (original)
+++ erp5/trunk/products/ERP5Type/patches/WorkflowTool.py Mon Nov 5 12:42:32 2007
@@ -96,7 +96,8 @@
"""
pass
-def getValidCriterionDict(worklist_match_dict, acceptable_key_dict):
+def getValidCriterionDict(worklist_match_dict, acceptable_key_dict,
+ workflow_worklist_key):
valid_criterion_dict = {}
metadata = None
for criterion_id, criterion_value in worklist_match_dict.iteritems():
@@ -110,10 +111,10 @@
elif criterion_id == SECURITY_PARAMETER_ID:
pass
else:
- LOG('WorkflowTool_listActions', WARNING, 'Worklist %s of ' \
- 'workflow %s filters on variable %s which is not available ' \
+ LOG('WorkflowTool_listActions', WARNING, 'Worklist %s' \
+ 'filters on variable %s which is not available ' \
'in catalog. Its value will not be checked.' % \
- (worklist_id, workflow_id, criterion_id))
+ (workflow_worklist_key, criterion_id))
return valid_criterion_dict, metadata
def updateWorklistSetDict(worklist_set_dict, workflow_worklist_key, valid_criterion_dict):
@@ -167,7 +168,8 @@
if getSecurityUidListAndRoleColumnDict is None:
valid_criterion_dict, metadata = getValidCriterionDict(
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:
metadata_dict[workflow_worklist_key] = metadata
updateWorklistSetDict(
More information about the Erp5-report
mailing list