X-Git-Url: http://git.inspyration.org/?a=blobdiff_plain;f=addons%2Fprocess%2Fprocess.py;h=a89b6a6caaa9bd6c8fdb12296ee92e635c35e5da;hb=cc98c750610545026f37e8b70f39da39380707df;hp=580c51e4c24830e929b0b511999446e4dab3f50c;hpb=c4f85984a48b887391edb6f1f1269e727347c163;p=odoo%2Fodoo.git diff --git a/addons/process/process.py b/addons/process/process.py index 580c51e..a89b6a6 100644 --- a/addons/process/process.py +++ b/addons/process/process.py @@ -45,12 +45,9 @@ class process_process(osv.osv): } def graph_get(self, cr, uid, id, res_model, res_id, scale, context): - pool = pooler.get_pool(cr.dbname) - process = pool.get('process.process').browse(cr, uid, [id])[0] current_object = pool.get(res_model).browse(cr, uid, [res_id])[0] - nodes = {} start = [] transitions = {} @@ -78,58 +75,46 @@ class process_process(osv.osv): pass nodes[node.id] = data - if node.flow_start: start.append(node.id) for tr in node.transition_out: data = {} - data['name'] = tr.name data['source'] = tr.source_node_id.id data['target'] = tr.target_node_id.id - data['buttons'] = buttons = [] for b in tr.action_ids: button = {} button['name'] = b.name buttons.append(button) - data['roles'] = roles = [] for r in tr.transition_ids: if r.role_id: role = {} role['name'] = r.role_id.name roles.append(role) - transitions[tr.id] = data g = tools.graph(nodes.keys(), map(lambda x: (x['source'], x['target']), transitions.values())) g.process(start) #g.scale(100, 100, 180, 120) g.scale(*scale) - graph = g.result_get() - miny = -1 for k,v in nodes.items(): - x = graph[k]['y'] y = graph[k]['x'] - if miny == -1: miny = y - miny = min(y, miny) - v['x'] = x v['y'] = y for k, v in nodes.items(): y = v['y'] v['y'] = min(y - miny + 10, y) - return dict(nodes=nodes, transitions=transitions) process_process() @@ -167,8 +152,6 @@ class process_transition(osv.osv): 'transition_ids': fields.many2many('workflow.transition', 'process_transition_ids', 'ptr_id', 'wtr_id', 'Workflow Transitions'), 'note': fields.text('Description'), } - _defaults = { - } process_transition() class process_transition_action(osv.osv): @@ -193,6 +176,3 @@ class process_transition_action(osv.osv): } process_transition_action() - -# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: -