modifs

[odoo/odoo.git] / addons / process / process.py

diff --git a/addons/process/process.py b/addons/process/process.py
index 8f88b0b..ea350b0 100644 (file)
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -2,7 +2,7 @@
 ##############################################################################
 #
 #    OpenERP, Open Source Management Solution  
-#    Copyright (C) 2004-2008 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+#    Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
 #    $Id$
 #
 #    This program is free software: you can redistribute it and/or modify
@@ -84,13 +84,14 @@ class process_process(osv.osv):
         return result
 
     def graph_get(self, cr, uid, id, res_model, res_id, scale, context):
-        if not res_model:
-            res_model = (self.browse(cr, uid, [id])[0]).model_id.model
 
         pool = pooler.get_pool(cr.dbname)
         
-        process = pool.get('process.process').browse(cr, uid, [id])[0]
-        title = process.name
+        process = pool.get('process.process').browse(cr, uid, [id], context)[0]
+
+        name = process.name
+        resource = None
+        state = 'N/A'
 
         expr_context = {}
         states = {}
@@ -103,7 +104,9 @@ class process_process(osv.osv):
             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]
             expr_context = Env(current_object, current_user)
-            title = _("%s - Resource: %s, State: %s") % (process.name, current_object.name, states.get(getattr(current_object, 'state'), 'N/A'))
+            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]
 
         notes = process.note or "N/A"
@@ -249,7 +252,7 @@ class process_process(osv.osv):
             y = v['y']
             v['y'] = min(y - miny + 10, y)
 
-        return dict(title=title, perm=perm, notes=notes, nodes=nodes, transitions=transitions)
+        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={}):
         """ Deep copy the entire process.
@@ -315,14 +318,14 @@ class process_node(osv.osv):
         'flow_start': lambda *args: False,
     }
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context={}):
         if not default:
             default = {}
         default.update({
             'transition_in': [],
             'transition_out': []
         })
-        return super(process_node, self).copy(cr, uid, id, default, context)
+        return super(process_node, self).copy_data(cr, uid, id, default, context)
 
 process_node()
 
@@ -372,7 +375,7 @@ class process_transition_action(osv.osv):
         'state': lambda *args: 'dummy',
     }
 
-    def copy(self, cr, uid, id, default=None, context={}):
+    def copy_data(self, cr, uid, id, default=None, context={}):
         if not default:
             default = {}
 
@@ -380,7 +383,7 @@ class process_transition_action(osv.osv):
         if state:
             default['state'] = state
 
-        return super(process_transition_action, self).copy(cr, uid, id, default, context)
+        return super(process_transition_action, self).copy_data(cr, uid, id, default, context)
 
 process_transition_action()