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

InteractionWorkflow.py: check script before execute script.

parent 24cda5ab
......@@ -270,10 +270,10 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
before_script_list = []
before_script_list.append(tdef.getBeforeScriptName())
if before_script_list != [] and tdef.getBeforeScriptName() is not None:
if tdef.getBeforeScriptName() is not None:
for script_name in before_script_list:
script = self._getOb(script_name)
script(sci)
script = self._getOb(script_name, None)
if script: script(sci)
return filtered_transition_list
def notifySuccess(self, ob, transition_list, result, args=None, kw=None):
......@@ -341,7 +341,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
# try to get the script without calling it.
script = self.getScriptValueList()[script_name]
# Pass lots of info to the script in a single parameter.
script(sci) # May throw an exception
if script: script(sci) # May throw an exception
# Queue the "Before Commit" scripts
sm = getSecurityManager()
......@@ -357,7 +357,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
activity_script_list.append(tdef.getActivateScriptName())
if activity_script_list != [] and tdef.getActivateScriptName() is not None:
for script_name in activity_script_list:
self .activate(activity='SQLQueue')\
self.activate(activity='SQLQueue')\
.activeScript(script_name, ob.getRelativeUrl(),
status, tdef.getId())
......
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