rattail/appypod-rattail
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

appy.gen: bugfixes in the new workflow engine and in macro 'history'.

Browse source
This commit is contained in:
Gaetan Delannay 2011-09-09 17:39:58 +02:00
parent 1cd9aaaf69
commit 5be03c2ed4
4 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gen/__init__.py
View file

@ -2384,6 +2384,7 @@ class Transition:
def isTriggerable(self, obj, wf):
'''Can this transition be triggered on p_obj?'''
wf = wf.__instance__ # We need the prototypical instance here.
# Checks that the current state of the object is a start state for this
# transition.
objState = obj.getState(name=False)
@ -2424,13 +2425,15 @@ class Transition:
def executeAction(self, obj, wf):
'''Executes the action related to this transition.'''
msg = ''
obj = obj.appy()
wf = wf.__instance__ # We need the prototypical instance here.
if type(self.action) in (tuple, list):
# We need to execute a list of actions
for act in self.action:
msgPart = act(wf, obj.appy())
msgPart = act(wf, obj)
if msgPart: msg += msgPart
else: # We execute a single action only.
msgPart = self.action(wf, obj.appy())
msgPart = self.action(wf, obj)
if msgPart: msg += msgPart
return msg
@ -2555,12 +2558,14 @@ class WorkflowAnonymous:
'''One-state workflow allowing anyone to consult and Manager to edit.'''
mgr = 'Manager'
active = State({r:(mgr, 'Anonymous'), w:mgr, d:mgr}, initial=True)
WorkflowAnonymous.__instance__ = WorkflowAnonymous()
class WorkflowAuthenticated:
'''One-state workflow allowing authenticated users to consult and Manager
to edit.'''
mgr = 'Manager'
active = State({r:(mgr, 'Authenticated'), w:mgr, d:mgr}, initial=True)
WorkflowAuthenticated.__instance__ = WorkflowAuthenticated()
# ------------------------------------------------------------------------------
class Selection: