Commit 0644d290 authored by wenjie.zheng's avatar wenjie.zheng

Workflow.py: correct state.getDestinationIdList, so the transition...

Workflow.py: correct state.getDestinationIdList, so the transition verification can be executed correctly.
parent c167d036
...@@ -190,7 +190,8 @@ class Workflow(XMLObject): ...@@ -190,7 +190,8 @@ class Workflow(XMLObject):
sdef = document._getDefaultAcquiredValue(self.getStateBaseCategory()) sdef = document._getDefaultAcquiredValue(self.getStateBaseCategory())
if sdef is None: if sdef is None:
return 0 return 0
if action in sdef.getDestinationValueList():
if action in sdef.getDestinationIdList():
tdef = self._getOb(action, None) tdef = self._getOb(action, None)
if (tdef is not None and if (tdef is not None and
tdef.trigger_type == TRIGGER_USER_ACTION and tdef.trigger_type == TRIGGER_USER_ACTION and
...@@ -247,9 +248,6 @@ class Workflow(XMLObject): ...@@ -247,9 +248,6 @@ class Workflow(XMLObject):
return changed return changed
### Security feature end ### Security feature end
def getRoleList(self): def getRoleList(self):
return sorted(self.getPortalObject().getDefaultModule('acl_users').valid_roles()) return sorted(self.getPortalObject().getDefaultModule('acl_users').valid_roles())
...@@ -315,7 +313,7 @@ class Workflow(XMLObject): ...@@ -315,7 +313,7 @@ class Workflow(XMLObject):
for tid in sdef.getDestinationIdList(): for tid in sdef.getDestinationIdList():
tdef = self._getOb(id=tid) tdef = self._getOb(id=tid)
LOG('zwj: Action is %s'%tid, WARNING, ' in Workflow.py.') #LOG('zwj: Action is %s'%tid, WARNING, ' in Workflow.py.')
if tdef is not None and tdef.trigger_type == TRIGGER_USER_ACTION and \ if tdef is not None and tdef.trigger_type == TRIGGER_USER_ACTION and \
tdef.actbox_name and self._checkTransitionGuard(tdef, document): tdef.actbox_name and self._checkTransitionGuard(tdef, document):
if fmt_data is None: if fmt_data is None:
......
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