X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;ds=sidebyside;f=addons%2Fprocess%2Fprocess.py;h=464cf460616a7067a270993f395f503710f3014a;hb=0d3bf8d1a21cae4d8bb70009fc34ad3520ca224c;hp=62483fb6e65fcf401814f292f41b86334a4f1b76;hpb=eb0b928cc0805a6b42ef971b14bd2aeee810f0d3;p=odoo%2Fodoo.git diff --git a/addons/process/process.py b/addons/process/process.py index 62483fb..464cf46 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -1,8 +1,8 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution -# Copyright (C) 2004-2009 Tiny SPRL (). +# Copyright (C) 2004-2010 Tiny SPRL (). # # This program is free software: you can redistribute it and/or modify # it under the terms of the GNU Affero General Public License as @@ -15,32 +15,27 @@ # 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 . +# along with this program. If not, see . # ############################################################################## -import netsvc -import pooler, tools - +import pooler +import tools from osv import fields, osv class Env(dict): - + def __init__(self, obj, user): self.__obj = obj self.__usr = user - + def __getitem__(self, name): - if name in ('__obj', '__user'): - return super(ExprContext, self).__getitem__(name) - + return super(Env, self).__getitem__(name) if name == 'user': return self.__user - if name == 'object': return self.__obj - return self.__obj[name] class process_process(osv.osv): @@ -48,7 +43,7 @@ class process_process(osv.osv): _description = "Process" _columns = { 'name': fields.char('Name', size=30,required=True, translate=True), - 'active': fields.boolean('Active'), + 'active': fields.boolean('Active', help="If the active field is set to False, it will allow you to hide the process without removing it."), 'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'), 'note': fields.text('Notes', translate=True), 'node_ids': fields.one2many('process.node', 'process_id', 'Nodes') @@ -57,7 +52,7 @@ class process_process(osv.osv): 'active' : lambda *a: True, } - def search_by_model(self, cr, uid, res_model, context): + def search_by_model(self, cr, uid, res_model, context=None): pool = pooler.get_pool(cr.dbname) model_ids = (res_model or None) and pool.get('ir.model').search(cr, uid, [('model', '=', res_model)]) @@ -67,7 +62,7 @@ class process_process(osv.osv): # search all processes res = pool.get('process.process').search(cr, uid, domain) if res: - res = pool.get('process.process').browse(cr, uid, res, context) + res = pool.get('process.process').browse(cr, uid, res, context=context) for process in res: result.append((process.id, process.name)) return result @@ -75,38 +70,38 @@ class process_process(osv.osv): # else search process nodes res = pool.get('process.node').search(cr, uid, domain) if res: - res = pool.get('process.node').browse(cr, uid, res, context) + res = pool.get('process.node').browse(cr, uid, res, context=context) for node in res: if (node.process_id.id, node.process_id.name) not in result: result.append((node.process_id.id, node.process_id.name)) return result - def graph_get(self, cr, uid, id, res_model, res_id, scale, context): + def graph_get(self, cr, uid, id, res_model, res_id, scale, context=None): pool = pooler.get_pool(cr.dbname) - - process = pool.get('process.process').browse(cr, uid, [id], context)[0] + + process = pool.get('process.process').browse(cr, uid, id, context=context) name = process.name - resource = None + resource = False state = 'N/A' expr_context = {} states = {} - perm = None + perm = False if res_model: states = dict(pool.get(res_model).fields_get(cr, uid, context=context).get('state', {}).get('selection', {})) if res_id: - current_object = pool.get(res_model).browse(cr, uid, [res_id], context)[0] - current_user = pool.get('res.users').browse(cr, uid, [uid], context)[0] + current_object = pool.get(res_model).browse(cr, uid, res_id, context=context) + current_user = pool.get('res.users').browse(cr, uid, uid, context=context) expr_context = Env(current_object, current_user) resource = current_object.name if 'state' in current_object: state = states.get(current_object.state, 'N/A') - perm = pool.get(res_model).perm_read(cr, uid, [res_id], context)[0] + perm = pool.get(res_model).perm_read(cr, uid, [res_id], context=context)[0] notes = process.note or "N/A" nodes = {} @@ -135,22 +130,22 @@ class process_process(osv.osv): if node.menu_id: data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id} - - if node.model_id and node.model_id.model == res_model: - try: - data['active'] = eval(node.model_states, expr_context) - except Exception, e: - pass - - if not data['active']: - try: - gray = True - for cond in node.condition_ids: - if cond.model_id and cond.model_id.model == res_model: - gray = gray and eval(cond.model_states, expr_context) - data['gray'] = not gray - except: - pass + + try: + gray = True + for cond in node.condition_ids: + if cond.model_id and cond.model_id.model == res_model: + gray = gray and eval(cond.model_states, expr_context) + data['gray'] = not gray + except: + pass + + if not data['gray']: + if node.model_id and node.model_id.model == res_model: + try: + data['active'] = eval(node.model_states, expr_context) + except Exception: + pass nodes[node.id] = data if node.flow_start: @@ -169,23 +164,19 @@ class process_process(osv.osv): button['state'] = b.state button['action'] = b.action buttons.append(button) - data['roles'] = roles = [] + data['groups'] = groups = [] for r in tr.transition_ids: - if r.role_id: - role = {} - role['name'] = r.role_id.name - roles.append(role) - for r in tr.role_ids: - role = {} - role['name'] = r.name - roles.append(role) + if r.group_id: + groups.append({'name': r.group_id.name}) + for r in tr.group_ids: + groups.append({'name': r.name}) transitions[tr.id] = data # now populate resource information def update_relatives(nid, ref_id, ref_model): relatives = [] - for tid, tr in transitions.items(): + for dummy, tr in transitions.items(): if tr['source'] == nid: relatives.append(tr['target']) if tr['target'] == nid: @@ -197,7 +188,7 @@ class process_process(osv.osv): nodes[nid]['res'] = resource = {'id': ref_id, 'model': ref_model} - refobj = pool.get(ref_model).browse(cr, uid, [ref_id], context)[0] + refobj = pool.get(ref_model).browse(cr, uid, ref_id, context=context) fields = pool.get(ref_model).fields_get(cr, uid, context=context) # check for directory_id from inherited from document module @@ -233,7 +224,7 @@ class process_process(osv.osv): # calculate graph layout g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values())) - g.process(start) + g.process(start) g.scale(*scale) #g.scale(100, 100, 180, 120) graph = g.result_get() @@ -251,18 +242,20 @@ class process_process(osv.osv): for k, v in nodes.items(): y = v['y'] v['y'] = min(y - miny + 10, y) - + + nodes = dict([str(n_key), n_val] for n_key, n_val in nodes.iteritems()) + transitions = dict([str(t_key), t_val] for t_key, t_val in transitions.iteritems()) return dict(name=name, resource=resource, state=state, perm=perm, notes=notes, nodes=nodes, transitions=transitions) - def copy(self, cr, uid, id, default=None, context={}): + def copy(self, cr, uid, id, default=None, context=None): """ Deep copy the entire process. """ if not default: default = {} - + pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id], context)[0] + process = pool.get('process.process').browse(cr, uid, id, context=context) nodes = {} transitions = {} @@ -296,7 +289,7 @@ process_process() class process_node(osv.osv): _name = 'process.node' - _description ='Process Nodes' + _description ='Process Node' _columns = { 'name': fields.char('Name', size=30,required=True, translate=True), 'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'), @@ -318,14 +311,14 @@ class process_node(osv.osv): 'flow_start': lambda *args: False, } - def copy_data(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} default.update({ 'transition_in': [], 'transition_out': [] }) - return super(process_node, self).copy_data(cr, uid, id, default, context) + return super(process_node, self).copy_data(cr, uid, id, default, context=context) process_node() @@ -342,14 +335,14 @@ process_node_condition() class process_transition(osv.osv): _name = 'process.transition' - _description ='Process Transitions' + _description ='Process Transition' _columns = { 'name': fields.char('Name', size=32, required=True, translate=True), 'source_node_id': fields.many2one('process.node', 'Source Node', required=True, ondelete='cascade'), 'target_node_id': fields.many2one('process.node', 'Target Node', required=True, ondelete='cascade'), 'action_ids': fields.one2many('process.transition.action', 'transition_id', 'Buttons'), 'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'), - 'role_ids': fields.many2many('res.roles', 'process_transition_roles_rel', 'tid', 'rid', 'Roles'), + 'group_ids': fields.many2many('res.groups', 'process_transition_group_rel', 'tid', 'rid', string='Required Groups'), 'note': fields.text('Description', translate=True), } process_transition() @@ -375,11 +368,11 @@ class process_transition_action(osv.osv): 'state': lambda *args: 'dummy', } - def copy_data(self, cr, uid, id, default=None, context={}): + def copy_data(self, cr, uid, id, default=None, context=None): if not default: default = {} - - state = self.pool.get('process.transition.action').browse(cr, uid, [id], context)[0].state + + state = self.pool.get('process.transition.action').browse(cr, uid, id, context=context).state if state: default['state'] = state