Commit 868150c0 authored by wenjie.zheng's avatar wenjie.zheng

Workflow.py: change the way to execute scrips by calling them directly.

parent e0dbedbb
......@@ -614,13 +614,13 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
if tdef is not None and tdef.getBeforeScriptId():
script_id = tdef.getBeforeScriptId()
if script_id:
script = self._getOb(script_id)
script = self._getOb(script_id, None)
# Pass lots of info to the script in a single parameter.
kwargs = form_kw
sci = StateChangeInfo(
document, self, former_status, tdef, old_sdef, new_sdef, kwargs)
try:
script.execute(sci) # May throw an exception.
script(sci) # May throw an exception.
except ValidationFailed, validation_exc:
before_script_success = 0
before_script_error_message = deepcopy(validation_exc.msg)
......@@ -719,7 +719,7 @@ class Workflow(IdAsReferenceMixin("", "prefix"), XMLObject):
if script.getTypeInfo().getId() == 'Workflow Script':
sci = StateChangeInfo(
document, self, former_status, tdef, old_sdef, new_sdef, kwargs)
script.execute(sci) # May throw an exception.
script(sci) # May throw an exception.
else:
raise NotImplementedError ('Unsupported Script %s for state %s'%(script_id, old_sdef.getReference()))
# Return the new state object.
......
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