Commit 3fb3cca3 authored by iv's avatar iv

ERP5Workflow: revert unintendedly commited change

regression in a2ce533c due to missing parenthesis in 'or' statement
parent a5342be9
......@@ -410,7 +410,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
if isinstance(values, Expression):
worklist_variable_value.setVariableExpression(values.text)
else:
worklist_variable_value.setVariableValue(values)
worklist_variable_value.setVariableValue(values[0]) #to be changed
worklist.setActboxUrl(qdef.actbox_url)
worklist.setActboxCategory(qdef.actbox_category)
......@@ -1290,8 +1290,10 @@ def generateActionList(worklist_metadata, worklist_result, portal_url):
format_data = metadata['format_data']
format_data._push({'count': document_count})
append({'name': metadata['worklist_title'] % format_data,
'url': '%s/%s' % (portal_url,
metadata['action_box_url'] or '' % format_data), #DCWorkflow were returning string 'None'
'url': (portal_url if not metadata['action_box_url'] else #in DCWorkflow: metadata['action_box_url] = 'None' (string)
'%s/%s' % (portal_url,
metadata['action_box_url'] % format_data)
),
'worklist_id': metadata['worklist_id'],
'workflow_title': metadata['workflow_title'],
'workflow_id': metadata['workflow_id'],
......
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