Commit a9194435 authored by wenjie.zheng's avatar wenjie.zheng

WorkflowTool.py: also convert interactuion variable, which should have been done.

parent 70810e93
......@@ -482,7 +482,7 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
variable.setInitialValue(vdef.default_value)
variable.setDescription(vdef.description)
# configure transition variable
if dc_workflow.transitions is not None:
if getattr(dc_workflow, 'transitions', None) is not None:
for tid in dc_workflow.transitions:
origin_tdef = dc_workflow.transitions[tid]
transition = workflow._getOb('transition_'+tid)
......@@ -497,6 +497,21 @@ class WorkflowTool(BaseTool, OriginalWorkflowTool):
tr_var_path = '/'.join(tr_var_path.split('/')[2:])
new_category.append(tr_var_path)
tr_var.setCausalityList(new_category)
if getattr(dc_workflow, 'interactions', None) is not None:
for tid in dc_workflow.interactions:
origin_tdef = dc_workflow.interactions[tid]
interaction = workflow._getOb('interaction_'+tid)
new_category = []
if origin_tdef.var_exprs is None:
var_exprs = {}
else: var_exprs = origin_tdef.var_exprs
for key in var_exprs:
tr_var = interaction.newContent(portal_type='Transition Variable', temp_object=temp)
tr_var.setDefaultExpr(var_exprs[key].text)
tr_var_path = getattr(workflow, 'variable_'+key).getPath()
tr_var_path = '/'.join(tr_var_path.split('/')[2:])
new_category.append(tr_var_path)
tr_var.setCausalityList(new_category)
self._finalizeWorkflowConversion(dc_workflow)
workflow.setId(workflow.default_reference)
return workflow
......
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