moerge

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

diff --git a/addons/process/process.py b/addons/process/process.py
index 2ac778d..f2d6449 100644 (file)
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -32,23 +32,31 @@ import pooler, tools
 from osv import fields, osv
 
 class Env(dict):
-
-    def __init__(self, parent):
-        self.__parent = parent
-
+    
+    def __init__(self, obj, user):
+        self.__obj = obj
+        self.__usr = user
+        
     def __getitem__(self, name):
-        if name == '__parent':
-            return super(Env, self).__getitem__(name)
-
-        return self.__parent[name]
+        
+        if name in ('__obj', '__user'):
+            return super(ExprContext, self).__getitem__(name)
+        
+        if name == 'user':
+            return self.__user
+        
+        if name == 'object':
+            return self.__obj
+        
+        return self.__obj[name]
 
 class process_process(osv.osv):
     _name = "process.process"
     _description = "Process"
     _columns = {
-        'name': fields.char('Name', size=30,required=True),
+        'name': fields.char('Name', size=30,required=True, translate=True),
         'active': fields.boolean('Active'),
-        'note': fields.text('Notes'),
+        'note': fields.text('Notes', translate=True),
         'node_ids': fields.one2many('process.node', 'process_id', 'Nodes')
     }
     _defaults = {
@@ -59,7 +67,10 @@ class process_process(osv.osv):
         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]
+        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)
         
         nodes = {}
         start = []
@@ -68,27 +79,30 @@ class process_process(osv.osv):
         for node in process.node_ids:
             data = {}
             data['name'] = node.name
-            data['menu'] = (node.menu_id or None) and node.menu_id.name
             data['model'] = (node.model_id or None) and node.model_id.model
             data['kind'] = node.kind
             data['notes'] = node.note
             data['active'] = 0
             data['gray'] = 0
+
+            if node.menu_id:
+                data['menu'] = {'name': node.menu_id.complete_name, 'id': node.menu_id.id}
             
             if node.kind == "state" and node.model_id and node.model_id.model == res_model:
                 try:
-                    data['active'] = eval(node.model_states, Env(current_object));
+                    if eval(node.model_states, expr_context):
+                        data['active'] = current_object.name_get(context)[0][1]
                 except Exception, e:
                     # waring: invalid state expression
                     pass
                 
             if not data['active']:
                 try:
-                    gray = False
+                    gray = True
                     for cond in node.condition_ids:
                         if cond.model_id and cond.model_id.model == res_model:
-                            gray = gray or eval(cond.model_states, Env(current_object))
-                    data['gray'] = gray
+                            gray = gray and eval(cond.model_states, expr_context)
+                    data['gray'] = not gray
                 except:
                     pass
 
@@ -144,11 +158,11 @@ class process_node(osv.osv):
     _name = 'process.node'
     _description ='Process Nodes'
     _columns = {
-        'name': fields.char('Name', size=30,required=True),
-        'process_id': fields.many2one('process.process', 'Process', required=True),
+        'name': fields.char('Name', size=30,required=True, translate=True),
+        'process_id': fields.many2one('process.process', 'Process', required=True, ondelete='cascade'),
         'kind': fields.selection([('state','State'), ('subflow','Subflow')], 'Kind of Node', required=True),
         'menu_id': fields.many2one('ir.ui.menu', 'Related Menu'),
-        'note': fields.text('Notes'),
+        'note': fields.text('Notes', translate=True),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('States Expression', size=128),
         'flow_start': fields.boolean('Starting Flow'),
@@ -168,7 +182,7 @@ class process_node_condition(osv.osv):
     _description = 'Condition'
     _columns = {
         'name': fields.char('Name', size=30, required=True),
-        'node_id': fields.many2one('process.node', 'Node', required=True),
+        'node_id': fields.many2one('process.node', 'Node', required=True, ondelete='cascade'),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
         'model_states': fields.char('Expression', required=True, size=128)
     }
@@ -178,12 +192,12 @@ class process_transition(osv.osv):
     _name = 'process.transition'
     _description ='Process Transitions'
     _columns = {
-        'name': fields.char('Name', size=32, required=True),
+        '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'),        
+        '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'),
-        'note': fields.text('Description'),
+        'note': fields.text('Description', translate=True),
     }
 process_transition()
 
@@ -191,14 +205,14 @@ class process_transition_action(osv.osv):
     _name = 'process.transition.action'
     _description ='Process Transitions Actions'
     _columns = {
-        'name': fields.char('Name', size=32, required=True),
+        'name': fields.char('Name', size=32, required=True, translate=True),
         'state': fields.selection([('dummy','Dummy'),
-                                   ('method','Object Method'),
+                                   ('object','Object Method'),
                                    ('workflow','Workflow Trigger'),
                                    ('action','Action')], 'Type', required=True),
         'action': fields.char('Action ID', size=64, states={
             'dummy':[('readonly',1)],
-            'method':[('required',1)],
+            'object':[('required',1)],
             'workflow':[('required',1)],
             'action':[('required',1)],
         },),