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

[gen] Display action fields with layout 'buttons' in query results and tied objects for refs, besides transitions. [gen] Show delete button when allowed on the view layout. [gen] Improved method AbstractWrapper::createFrom.

Browse source
This commit is contained in:
Gaetan Delannay 2015-01-06 21:13:30 +01:00
parent 225ea927a4
commit 746a6cd52d
7 changed files with 171 additions and 131 deletions
Download patch file Download diff file Expand all files Collapse all files

8
fields/workflow.py
View file

@ -328,7 +328,7 @@ class Transition:
# functions return True.
hasRole = None
for condition in self.condition:
# "Unwrap" role names from Role instances.
# "Unwrap" role names from Role instances
if isinstance(condition, Role): condition = condition.name
if isinstance(condition, basestring): # It is a role
if hasRole == None:
@ -337,7 +337,7 @@ class Transition:
hasRole = True
else: # It is a method
res = condition(wf, obj.appy())
if not res: return res # False or a No instance.
if not res: return res # False or a No instance
if hasRole != False:
return True
@ -345,13 +345,13 @@ class Transition:
'''Executes the action related to this transition.'''
msg = ''
obj = obj.appy()
wf = wf.__instance__ # We need the prototypical instance here.
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)
if msgPart: msg += msgPart
else: # We execute a single action only.
else: # We execute a single action only
msgPart = self.action(wf, obj)
if msgPart: msg += msgPart
return msg