Commit 060b985b authored by wenjie.zheng's avatar wenjie.zheng Committed by Sebastien Robin

WorkflowTool.py: deal the case when actbox_url is an empty string.

parent 289c455b
...@@ -326,7 +326,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -326,7 +326,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
transition.setActboxName(tdef.actbox_name) transition.setActboxName(tdef.actbox_name)
# alter actbox_url to gain compatibility of erp5 workflow # alter actbox_url to gain compatibility of erp5 workflow
compatible_url = tdef.actbox_url compatible_url = tdef.actbox_url
if compatible_url is not None: if compatible_url is not '':
index_action_id = compatible_url.find(tdef.id) index_action_id = compatible_url.find(tdef.id)
compatible_url = compatible_url[:index_action_id] + 'transition_' + compatible_url[index_action_id:] compatible_url = compatible_url[:index_action_id] + 'transition_' + compatible_url[index_action_id:]
transition.setActboxUrl(compatible_url) transition.setActboxUrl(compatible_url)
...@@ -414,10 +414,11 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -414,10 +414,11 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
state_id_list.append(state_id) state_id_list.append(state_id)
worklist.setMatchedSimulationStateList(state_id_list) worklist.setMatchedSimulationStateList(state_id_list)
# alter url: # alter url:
compatible_url = qdef.actbox_url if qdef.actbox_url is not '':
index_state_id = compatible_url.find(value) compatible_url = qdef.actbox_url
compatible_url = compatible_url[:index_state_id] + 'state_' + compatible_url[index_state_id:] index_state_id = compatible_url.find(value)
worklist.setActboxUrl(compatible_url) compatible_url = compatible_url[:index_state_id] + 'state_' + compatible_url[index_state_id:]
worklist.setActboxUrl(compatible_url)
elif key == 'validation_state': elif key == 'validation_state':
state_id_list = [] state_id_list = []
for value in values: for value in values:
...@@ -425,10 +426,11 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool): ...@@ -425,10 +426,11 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
state_id_list.append(state_id) state_id_list.append(state_id)
worklist.setMatchedValidationStateList(state_id_list) worklist.setMatchedValidationStateList(state_id_list)
# alter url: # alter url:
compatible_url = qdef.actbox_url if qdef.actbox_url is not '':
index_state_id = compatible_url.find(value) compatible_url = qdef.actbox_url
compatible_url = compatible_url[:index_state_id] + 'state_' + compatible_url[index_state_id:] index_state_id = compatible_url.find(value)
worklist.setActboxUrl(compatible_url) compatible_url = compatible_url[:index_state_id] + 'state_' + compatible_url[index_state_id:]
worklist.setActboxUrl(compatible_url)
worklist.setActboxCategory(qdef.actbox_category) worklist.setActboxCategory(qdef.actbox_category)
worklist.setActboxIcon(qdef.actbox_icon) worklist.setActboxIcon(qdef.actbox_icon)
worklist.setActboxName(qdef.actbox_name) worklist.setActboxName(qdef.actbox_name)
......
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