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

InteractionWorkflow.py: fix that interaction can only have single script definded.

parent 883ea9ba
...@@ -262,9 +262,8 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow): ...@@ -262,9 +262,8 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
sci = StateChangeInfo( sci = StateChangeInfo(
ob, self, former_status, tdef, None, None, kwargs=kw) ob, self, former_status, tdef, None, None, kwargs=kw)
before_script_list = [] before_script_list = tdef.getBeforeScriptNameList()
before_script_list.append(tdef.getBeforeScriptName()) if before_script_list != [] and before_script_list is not None:
if tdef.getBeforeScriptName() is not None:
for script_name in before_script_list: for script_name in before_script_list:
script = self._getOb(script_name, None) script = self._getOb(script_name, None)
if script: script(sci) if script: script(sci)
...@@ -328,28 +327,25 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow): ...@@ -328,28 +327,25 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
ob, self, former_status, tdef, None, None, kwargs=kw) ob, self, former_status, tdef, None, None, kwargs=kw)
# Execute the "after" script. # Execute the "after" script.
after_script_list = [] after_script_list = tdef.getAfterScriptNameList()
after_script_list.append(tdef.getAfterScriptName()) if after_script_list != [] and after_script_list is not None:
if after_script_list != [] and tdef.getAfterScriptName() is not None:
for script_name in after_script_list: for script_name in after_script_list:
# try to get the script without calling it. # try to get the script without calling it.
script = self.getScriptValueList()[script_name] script = self._getOb(script_name, None)
# Pass lots of info to the script in a single parameter. # Pass lots of info to the script in a single parameter.
if script: script(sci) # May throw an exception if script: script(sci) # May throw an exception
# Queue the "Before Commit" scripts # Queue the "Before Commit" scripts
sm = getSecurityManager() sm = getSecurityManager()
before_commit_script_list = [] before_commit_script_list = tdef.getBeforeCommitScriptNameList()
before_commit_script_list.append(tdef.getBeforeCommitScriptName()) if before_commit_script_list != [] and before_commit_script_list is not None:
if before_commit_script_list != [] and tdef.getBeforeCommitScriptName() is not None:
for script_name in before_commit_script_list: for script_name in before_commit_script_list:
transaction.get().addBeforeCommitHook(self._before_commit, transaction.get().addBeforeCommitHook(self._before_commit,
(sci, script_name, sm)) (sci, script_name, sm))
# Execute "activity" scripts # Execute "activity" scripts
activity_script_list = [] activity_script_list = tdef.getActivateScriptNameList()
activity_script_list.append(tdef.getActivateScriptName()) if activity_script_list != [] and activity_script_list is not None:
if activity_script_list != [] and tdef.getActivateScriptName() is not None:
for script_name in activity_script_list: for script_name in activity_script_list:
self.activate(activity='SQLQueue')\ self.activate(activity='SQLQueue')\
.activeScript(script_name, ob.getRelativeUrl(), .activeScript(script_name, ob.getRelativeUrl(),
......
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