[REF] service: workflow is not a service
- simply use openerp.workflow instead of the funky netsvc.LocalService - the funky netsvc.LocalService is still available though - all the methods are now simple function (the self was unnecessary) bzr revid: vmt@openerp.com-20130130173759-xxgyafxqzp3okz3c
This commit is contained in:
parent
2c2b6d9506
commit
8b5e317eab
|
@ -91,8 +91,8 @@ def LocalService(name):
|
||||||
# are updated to directly use openerp.osv.osv.service.
|
# are updated to directly use openerp.osv.osv.service.
|
||||||
if name == 'object_proxy':
|
if name == 'object_proxy':
|
||||||
return openerp.service.model
|
return openerp.service.model
|
||||||
if name == 'db':
|
if name == 'workflow':
|
||||||
return openerp.service.db
|
return openerp.workflow
|
||||||
|
|
||||||
return Service._services[name]
|
return Service._services[name]
|
||||||
|
|
||||||
|
|
|
@ -19,10 +19,123 @@
|
||||||
#
|
#
|
||||||
##############################################################################
|
##############################################################################
|
||||||
|
|
||||||
import wkf_service
|
import instance
|
||||||
|
|
||||||
#.apidoc title: Workflow objects
|
wkf_on_create_cache = {}
|
||||||
|
|
||||||
|
def clear_cache(cr, uid):
|
||||||
|
wkf_on_create_cache[cr.dbname]={}
|
||||||
|
|
||||||
|
def trg_write(uid, res_type, res_id, cr):
|
||||||
|
"""
|
||||||
|
Reevaluates the specified workflow instance. Thus if any condition for
|
||||||
|
a transition have been changed in the backend, then running ``trg_write``
|
||||||
|
will move the workflow over that transition.
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id the workflow belongs to
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
ident = (uid,res_type,res_id)
|
||||||
|
cr.execute('select id from wkf_instance where res_id=%s and res_type=%s and state=%s', (res_id or None,res_type or None, 'active'))
|
||||||
|
for (id,) in cr.fetchall():
|
||||||
|
instance.update(cr, id, ident)
|
||||||
|
|
||||||
|
def trg_trigger(uid, res_type, res_id, cr):
|
||||||
|
"""
|
||||||
|
Activate a trigger.
|
||||||
|
|
||||||
|
If a workflow instance is waiting for a trigger from another model, then this
|
||||||
|
trigger can be activated if its conditions are met.
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id the workflow belongs to
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
cr.execute('select instance_id from wkf_triggers where res_id=%s and model=%s', (res_id,res_type))
|
||||||
|
res = cr.fetchall()
|
||||||
|
for (instance_id,) in res:
|
||||||
|
cr.execute('select %s,res_type,res_id from wkf_instance where id=%s', (uid, instance_id,))
|
||||||
|
ident = cr.fetchone()
|
||||||
|
instance.update(cr, instance_id, ident)
|
||||||
|
|
||||||
|
def trg_delete(uid, res_type, res_id, cr):
|
||||||
|
"""
|
||||||
|
Delete a workflow instance
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id the workflow belongs to
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
ident = (uid,res_type,res_id)
|
||||||
|
instance.delete(cr, ident)
|
||||||
|
|
||||||
|
def trg_create(uid, res_type, res_id, cr):
|
||||||
|
"""
|
||||||
|
Create a new workflow instance
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id to own the created worfklow instance
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
ident = (uid,res_type,res_id)
|
||||||
|
wkf_on_create_cache.setdefault(cr.dbname, {})
|
||||||
|
if res_type in wkf_on_create_cache[cr.dbname]:
|
||||||
|
wkf_ids = wkf_on_create_cache[cr.dbname][res_type]
|
||||||
|
else:
|
||||||
|
cr.execute('select id from wkf where osv=%s and on_create=True', (res_type,))
|
||||||
|
wkf_ids = cr.fetchall()
|
||||||
|
wkf_on_create_cache[cr.dbname][res_type] = wkf_ids
|
||||||
|
for (wkf_id,) in wkf_ids:
|
||||||
|
instance.create(cr, ident, wkf_id)
|
||||||
|
|
||||||
|
def trg_validate(uid, res_type, res_id, signal, cr):
|
||||||
|
"""
|
||||||
|
Fire a signal on a given workflow instance
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id the workflow belongs to
|
||||||
|
:signal: the signal name to be fired
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
result = False
|
||||||
|
ident = (uid,res_type,res_id)
|
||||||
|
# ids of all active workflow instances for a corresponding resource (id, model_nam)
|
||||||
|
cr.execute('select id from wkf_instance where res_id=%s and res_type=%s and state=%s', (res_id, res_type, 'active'))
|
||||||
|
for (id,) in cr.fetchall():
|
||||||
|
res2 = instance.validate(cr, id, ident, signal)
|
||||||
|
result = result or res2
|
||||||
|
return result
|
||||||
|
|
||||||
|
def trg_redirect(uid, res_type, res_id, new_rid, cr):
|
||||||
|
"""
|
||||||
|
Re-bind a workflow instance to another instance of the same model.
|
||||||
|
|
||||||
|
Make all workitems which are waiting for a (subflow) workflow instance
|
||||||
|
for the old resource point to the (first active) workflow instance for
|
||||||
|
the new resource.
|
||||||
|
|
||||||
|
:param res_type: the model name
|
||||||
|
:param res_id: the model instance id the workflow belongs to
|
||||||
|
:param new_rid: the model instance id to own the worfklow instance
|
||||||
|
:param cr: a database cursor
|
||||||
|
"""
|
||||||
|
# get ids of wkf instances for the old resource (res_id)
|
||||||
|
#CHECKME: shouldn't we get only active instances?
|
||||||
|
cr.execute('select id, wkf_id from wkf_instance where res_id=%s and res_type=%s', (res_id, res_type))
|
||||||
|
for old_inst_id, wkf_id in cr.fetchall():
|
||||||
|
# first active instance for new resource (new_rid), using same wkf
|
||||||
|
cr.execute(
|
||||||
|
'SELECT id '\
|
||||||
|
'FROM wkf_instance '\
|
||||||
|
'WHERE res_id=%s AND res_type=%s AND wkf_id=%s AND state=%s',
|
||||||
|
(new_rid, res_type, wkf_id, 'active'))
|
||||||
|
new_id = cr.fetchone()
|
||||||
|
if new_id:
|
||||||
|
# select all workitems which "wait" for the old instance
|
||||||
|
cr.execute('select id from wkf_workitem where subflow_id=%s', (old_inst_id,))
|
||||||
|
for (item_id,) in cr.fetchall():
|
||||||
|
# redirect all those workitems to the wkf instance of the new resource
|
||||||
|
cr.execute('update wkf_workitem set subflow_id=%s where id=%s', (new_id[0], item_id))
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
||||||
|
|
||||||
|
|
|
@ -1,156 +0,0 @@
|
||||||
# -*- coding: utf-8 -*-
|
|
||||||
##############################################################################
|
|
||||||
#
|
|
||||||
# OpenERP, Open Source Management Solution
|
|
||||||
# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>).
|
|
||||||
#
|
|
||||||
# This program is free software: you can redistribute it and/or modify
|
|
||||||
# it under the terms of the GNU Affero General Public License as
|
|
||||||
# published by the Free Software Foundation, either version 3 of the
|
|
||||||
# License, or (at your option) any later version.
|
|
||||||
#
|
|
||||||
# This program is distributed in the hope that it will be useful,
|
|
||||||
# but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
||||||
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
||||||
# GNU Affero General Public License for more details.
|
|
||||||
#
|
|
||||||
# You should have received a copy of the GNU Affero General Public License
|
|
||||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
||||||
#
|
|
||||||
##############################################################################
|
|
||||||
import instance
|
|
||||||
import openerp.netsvc as netsvc
|
|
||||||
|
|
||||||
class workflow_service(netsvc.Service):
|
|
||||||
"""
|
|
||||||
Sometimes you might want to fire a signal or re-evaluate the current state
|
|
||||||
of a workflow using the service's API. You can access the workflow services
|
|
||||||
using:
|
|
||||||
|
|
||||||
>>> import netsvc
|
|
||||||
>>> wf_service = netsvc.LocalService("workflow")
|
|
||||||
|
|
||||||
"""
|
|
||||||
|
|
||||||
def __init__(self, name='workflow'):
|
|
||||||
netsvc.Service.__init__(self, name)
|
|
||||||
self.wkf_on_create_cache={}
|
|
||||||
|
|
||||||
def clear_cache(self, cr, uid):
|
|
||||||
self.wkf_on_create_cache[cr.dbname]={}
|
|
||||||
|
|
||||||
def trg_write(self, uid, res_type, res_id, cr):
|
|
||||||
"""
|
|
||||||
Reevaluates the specified workflow instance. Thus if any condition for
|
|
||||||
a transition have been changed in the backend, then running ``trg_write``
|
|
||||||
will move the workflow over that transition.
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id the workflow belongs to
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
ident = (uid,res_type,res_id)
|
|
||||||
cr.execute('select id from wkf_instance where res_id=%s and res_type=%s and state=%s', (res_id or None,res_type or None, 'active'))
|
|
||||||
for (id,) in cr.fetchall():
|
|
||||||
instance.update(cr, id, ident)
|
|
||||||
|
|
||||||
def trg_trigger(self, uid, res_type, res_id, cr):
|
|
||||||
"""
|
|
||||||
Activate a trigger.
|
|
||||||
|
|
||||||
If a workflow instance is waiting for a trigger from another model, then this
|
|
||||||
trigger can be activated if its conditions are met.
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id the workflow belongs to
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
cr.execute('select instance_id from wkf_triggers where res_id=%s and model=%s', (res_id,res_type))
|
|
||||||
res = cr.fetchall()
|
|
||||||
for (instance_id,) in res:
|
|
||||||
cr.execute('select %s,res_type,res_id from wkf_instance where id=%s', (uid, instance_id,))
|
|
||||||
ident = cr.fetchone()
|
|
||||||
instance.update(cr, instance_id, ident)
|
|
||||||
|
|
||||||
def trg_delete(self, uid, res_type, res_id, cr):
|
|
||||||
"""
|
|
||||||
Delete a workflow instance
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id the workflow belongs to
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
ident = (uid,res_type,res_id)
|
|
||||||
instance.delete(cr, ident)
|
|
||||||
|
|
||||||
def trg_create(self, uid, res_type, res_id, cr):
|
|
||||||
"""
|
|
||||||
Create a new workflow instance
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id to own the created worfklow instance
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
ident = (uid,res_type,res_id)
|
|
||||||
self.wkf_on_create_cache.setdefault(cr.dbname, {})
|
|
||||||
if res_type in self.wkf_on_create_cache[cr.dbname]:
|
|
||||||
wkf_ids = self.wkf_on_create_cache[cr.dbname][res_type]
|
|
||||||
else:
|
|
||||||
cr.execute('select id from wkf where osv=%s and on_create=True', (res_type,))
|
|
||||||
wkf_ids = cr.fetchall()
|
|
||||||
self.wkf_on_create_cache[cr.dbname][res_type] = wkf_ids
|
|
||||||
for (wkf_id,) in wkf_ids:
|
|
||||||
instance.create(cr, ident, wkf_id)
|
|
||||||
|
|
||||||
def trg_validate(self, uid, res_type, res_id, signal, cr):
|
|
||||||
"""
|
|
||||||
Fire a signal on a given workflow instance
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id the workflow belongs to
|
|
||||||
:signal: the signal name to be fired
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
result = False
|
|
||||||
ident = (uid,res_type,res_id)
|
|
||||||
# ids of all active workflow instances for a corresponding resource (id, model_nam)
|
|
||||||
cr.execute('select id from wkf_instance where res_id=%s and res_type=%s and state=%s', (res_id, res_type, 'active'))
|
|
||||||
for (id,) in cr.fetchall():
|
|
||||||
res2 = instance.validate(cr, id, ident, signal)
|
|
||||||
result = result or res2
|
|
||||||
return result
|
|
||||||
|
|
||||||
def trg_redirect(self, uid, res_type, res_id, new_rid, cr):
|
|
||||||
"""
|
|
||||||
Re-bind a workflow instance to another instance of the same model.
|
|
||||||
|
|
||||||
Make all workitems which are waiting for a (subflow) workflow instance
|
|
||||||
for the old resource point to the (first active) workflow instance for
|
|
||||||
the new resource.
|
|
||||||
|
|
||||||
:param res_type: the model name
|
|
||||||
:param res_id: the model instance id the workflow belongs to
|
|
||||||
:param new_rid: the model instance id to own the worfklow instance
|
|
||||||
:param cr: a database cursor
|
|
||||||
"""
|
|
||||||
# get ids of wkf instances for the old resource (res_id)
|
|
||||||
#CHECKME: shouldn't we get only active instances?
|
|
||||||
cr.execute('select id, wkf_id from wkf_instance where res_id=%s and res_type=%s', (res_id, res_type))
|
|
||||||
for old_inst_id, wkf_id in cr.fetchall():
|
|
||||||
# first active instance for new resource (new_rid), using same wkf
|
|
||||||
cr.execute(
|
|
||||||
'SELECT id '\
|
|
||||||
'FROM wkf_instance '\
|
|
||||||
'WHERE res_id=%s AND res_type=%s AND wkf_id=%s AND state=%s',
|
|
||||||
(new_rid, res_type, wkf_id, 'active'))
|
|
||||||
new_id = cr.fetchone()
|
|
||||||
if new_id:
|
|
||||||
# select all workitems which "wait" for the old instance
|
|
||||||
cr.execute('select id from wkf_workitem where subflow_id=%s', (old_inst_id,))
|
|
||||||
for (item_id,) in cr.fetchall():
|
|
||||||
# redirect all those workitems to the wkf instance of the new resource
|
|
||||||
cr.execute('update wkf_workitem set subflow_id=%s where id=%s', (new_id[0], item_id))
|
|
||||||
workflow_service()
|
|
||||||
|
|
||||||
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
|
|
||||||
|
|
Loading…
Reference in New Issue