diff options
Diffstat (limited to 'bin/workflow/instance.py')
| -rw-r--r-- | bin/workflow/instance.py | 84 |
1 files changed, 42 insertions, 42 deletions
diff --git a/bin/workflow/instance.py b/bin/workflow/instance.py index d25bc367f4c..82071e462f7 100644 --- a/bin/workflow/instance.py +++ b/bin/workflow/instance.py @@ -33,54 +33,54 @@ import netsvc import pooler def create(cr, ident, wkf_id): - (uid,res_type,res_id) = ident - cr.execute("select nextval('wkf_instance_id_seq')") - id_new = cr.fetchone()[0] - cr.execute('insert into wkf_instance (id,res_type,res_id,uid,wkf_id) values (%d,%s,%s,%s,%s)', (id_new,res_type,res_id,uid,wkf_id)) - cr.execute('select * from wkf_activity where flow_start=True and wkf_id=%d', (wkf_id,)) - res = cr.dictfetchall() - stack = [] - workitem.create(cr, res, id_new, ident, stack=stack) - update(cr, id_new, ident) - return id_new + (uid,res_type,res_id) = ident + cr.execute("select nextval('wkf_instance_id_seq')") + id_new = cr.fetchone()[0] + cr.execute('insert into wkf_instance (id,res_type,res_id,uid,wkf_id) values (%d,%s,%s,%s,%s)', (id_new,res_type,res_id,uid,wkf_id)) + cr.execute('select * from wkf_activity where flow_start=True and wkf_id=%d', (wkf_id,)) + res = cr.dictfetchall() + stack = [] + workitem.create(cr, res, id_new, ident, stack=stack) + update(cr, id_new, ident) + return id_new def delete(cr, ident): - (uid,res_type,res_id) = ident - cr.execute('delete from wkf_instance where res_id=%d and res_type=%s', (res_id,res_type)) + (uid,res_type,res_id) = ident + cr.execute('delete from wkf_instance where res_id=%d and res_type=%s', (res_id,res_type)) def validate(cr, inst_id, ident, signal, force_running=False): - cr.execute("select * from wkf_workitem where inst_id=%d", (inst_id,)) - for witem in cr.dictfetchall(): - stack = [] - workitem.process(cr, witem, ident, signal, force_running, stack=stack) - # An action is returned - _update_end(cr, inst_id, ident) - return stack and stack[0] or False + cr.execute("select * from wkf_workitem where inst_id=%d", (inst_id,)) + for witem in cr.dictfetchall(): + stack = [] + workitem.process(cr, witem, ident, signal, force_running, stack=stack) + # An action is returned + _update_end(cr, inst_id, ident) + return stack and stack[0] or False def update(cr, inst_id, ident): - cr.execute("select * from wkf_workitem where inst_id=%d", (inst_id,)) - for witem in cr.dictfetchall(): - stack = [] - workitem.process(cr, witem, ident, stack=stack) - return _update_end(cr, inst_id, ident) + cr.execute("select * from wkf_workitem where inst_id=%d", (inst_id,)) + for witem in cr.dictfetchall(): + stack = [] + workitem.process(cr, witem, ident, stack=stack) + return _update_end(cr, inst_id, ident) def _update_end(cr, inst_id, ident): - cr.execute('select wkf_id from wkf_instance where id=%d', (inst_id,)) - wkf_id = cr.fetchone()[0] - cr.execute('select state,flow_stop from wkf_workitem w left join wkf_activity a on (a.id=w.act_id) where w.inst_id=%d', (inst_id,)) - ok=True - for r in cr.fetchall(): - if (r[0]<>'complete') or not r[1]: - ok=False - break - if ok: - cr.execute('select distinct a.name from wkf_activity a left join wkf_workitem w on (a.id=w.act_id) where w.inst_id=%d', (inst_id,)) - act_names = cr.fetchall() - cr.execute("update wkf_instance set state='complete' where id=%d", (inst_id,)) - cr.execute("update wkf_workitem set state='complete' where subflow_id=%d", (inst_id,)) - cr.execute("select i.id,w.osv,i.res_id from wkf_instance i left join wkf w on (i.wkf_id=w.id) where i.id in (select inst_id from wkf_workitem where subflow_id=%d)", (inst_id,)) - for i in cr.fetchall(): - for act_name in act_names: - validate(cr, i[0], (ident[0],i[1],i[2]), 'subflow.'+act_name[0]) - return ok + cr.execute('select wkf_id from wkf_instance where id=%d', (inst_id,)) + wkf_id = cr.fetchone()[0] + cr.execute('select state,flow_stop from wkf_workitem w left join wkf_activity a on (a.id=w.act_id) where w.inst_id=%d', (inst_id,)) + ok=True + for r in cr.fetchall(): + if (r[0]<>'complete') or not r[1]: + ok=False + break + if ok: + cr.execute('select distinct a.name from wkf_activity a left join wkf_workitem w on (a.id=w.act_id) where w.inst_id=%d', (inst_id,)) + act_names = cr.fetchall() + cr.execute("update wkf_instance set state='complete' where id=%d", (inst_id,)) + cr.execute("update wkf_workitem set state='complete' where subflow_id=%d", (inst_id,)) + cr.execute("select i.id,w.osv,i.res_id from wkf_instance i left join wkf w on (i.wkf_id=w.id) where i.id in (select inst_id from wkf_workitem where subflow_id=%d)", (inst_id,)) + for i in cr.fetchall(): + for act_name in act_names: + validate(cr, i[0], (ident[0],i[1],i[2]), 'subflow.'+act_name[0]) + return ok |