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

InteractionWorkflow.py: change the way to execute script by calling them directly.

parent 244ed820
......@@ -271,7 +271,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
if before_script_list != [] and tdef.getBeforeScriptName() is not None:
for script_name in before_script_list:
script = self._getOb(script_name)
script.execute(sci)
script(sci)
return filtered_transition_list
def notifySuccess(self, ob, transition_list, result, args=None, kw=None):
......@@ -339,7 +339,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.execute(sci) # May throw an exception
script(sci) # May throw an exception
# Queue the "Before Commit" scripts
sm = getSecurityManager()
......@@ -372,7 +372,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
# between here and when the interaction was executed... So we
# need to switch to the security manager as it was back then
setSecurityManager(security_manager)
self._getOb(script_name).execute(sci)
self._getOb(script_name)(sci)
finally:
setSecurityManager(current_security_manager)
......@@ -382,7 +382,7 @@ class InteractionWorkflow(IdAsReferenceMixin("", "prefix"), Workflow):
tdef = self._getOb(tdef_id)
sci = StateChangeInfo(
ob, self, former_status, tdef, None, None, None)
script.execute(sci)
script(sci)
def isActionSupported(self, document, action, **kw):
'''
......
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