cco/cybertools
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes for 'start' and 'move' transitions

Browse source
This commit is contained in:
Helmut Merz 2015-05-19 07:10:10 +02:00
parent a83f80a1f9
commit 12a5b339ad
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
organize/work.py
View file

@ -41,7 +41,7 @@ _not_found = object()
def workItemStates(): def workItemStates():
return StatesDefinition('workItemStates', return StatesDefinition('workItemStates',
State('new', 'new', State('new', 'new',
('plan', 'accept', 'start', 'work', 'finish', 'delegate', ('plan', 'accept', 'start', 'work', 'finish', 'delegate',
'cancel', 'reopen'), # 'move', # ? 'cancel', 'reopen'), # 'move', # ?
color='red'), color='red'),
State('planned', 'planned', State('planned', 'planned',
@ -297,12 +297,12 @@ class WorkItem(Stateful, Track):
# stop any running work item of user: # stop any running work item of user:
# TODO: check: party query OK? # TODO: check: party query OK?
if (userName == self.userName and if (userName == self.userName and
self.workItemType == 'work' and self.workItemType in (None, 'work') and
self.state != 'running'): self.state != 'running'):
running = getParent(self).query( running = getParent(self).query(
party=userName, state='running') party=userName, state='running')
for wi in running: for wi in running:
if wi.workItemType == 'work': if wi.workItemType in 'work':
wi.doAction('work', userName, wi.doAction('work', userName,
end=(kw.get('start') or getTimeStamp())) end=(kw.get('start') or getTimeStamp()))
# standard creation of new work item: # standard creation of new work item:
@ -328,7 +328,10 @@ class WorkItem(Stateful, Track):
new = moved.createNew(None, userName, taskId=task, runId=0, **kw) new = moved.createNew(None, userName, taskId=task, runId=0, **kw)
new.userName = self.userName new.userName = self.userName
new.data['source'] = moved.name new.data['source'] = moved.name
new.state = self.state if self.state == 'new':
new.state = 'planned'
else:
new.state = self.state
new.reindex() new.reindex()
moved.data['target'] = new.name moved.data['target'] = new.name
moved.state = 'moved' moved.state = 'moved'