merge

bzr revid: fp@tinyerp.com-20080919143639-8wyr7xzcn94suqcl

2 files changed, 184 insertions, 19 deletions

diff --git a/addons/process/process.py b/addons/process/process.py
index 74b0d6fc036..9044a9d82a5 100644
--- a/addons/process/process.py
+++ b/addons/process/process.py
@@ -31,6 +31,25 @@ import pooler, 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)
+        
+        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"
@@ -46,34 +65,46 @@ 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]
+        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 = []
         transitions = {}
-        for node in process.node_ids:
 
+        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:
-                states = node.model_states
-                states = (states or []) and states.split(',')
-                data['active'] = not states or current_object.state in states
-
-            elif node.kind == "router":
-                #TODO:
-                pass
-
-            elif node.kind == "subflow":
-                #TODO: subflow
-                pass
+                try:
+                    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 = 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
 
             nodes[node.id] = data
             if node.flow_start:
@@ -129,7 +160,7 @@ class process_node(osv.osv):
     _columns = {
         'name': fields.char('Name', size=30,required=True),
         'process_id': fields.many2one('process.process', 'Process', required=True),
-        'kind': fields.selection([('state','State'),('router','Router'),('subflow','Subflow')],'Kind of Node', required=True),
+        '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'),
         'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
@@ -137,6 +168,7 @@ class process_node(osv.osv):
         'flow_start': fields.boolean('Starting Flow'),
         'transition_in': fields.one2many('process.transition', 'target_node_id', 'Starting Transitions'),
         'transition_out': fields.one2many('process.transition', 'source_node_id', 'Ending Transitions'),
+        'condition_ids': fields.one2many('process.condition', 'node_id', 'Conditions')
     }
     _defaults = {
         'kind': lambda *args: 'state',
@@ -145,6 +177,17 @@ class process_node(osv.osv):
     }
 process_node()
 
+class process_node_condition(osv.osv):
+    _name = 'process.condition'
+    _description = 'Condition'
+    _columns = {
+        'name': fields.char('Name', size=30, required=True),
+        'node_id': fields.many2one('process.node', 'Node', required=True),
+        'model_id': fields.many2one('ir.model', 'Object', ondelete='set null'),
+        'model_states': fields.char('Expression', required=True, size=128)
+    }
+process_node_condition()
+
 class process_transition(osv.osv):
     _name = 'process.transition'
     _description ='Process Transitions'
@@ -164,12 +207,12 @@ class process_transition_action(osv.osv):
     _columns = {
         'name': fields.char('Name', size=32, required=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)],
         },),
diff --git a/addons/process/process_view.xml b/addons/process/process_view.xml
index ac3020cea59..d9a4d93799f 100644
--- a/addons/process/process_view.xml
+++ b/addons/process/process_view.xml
@@ -71,11 +71,26 @@
                                             </form>
                                         </field>
                                     </page>
+                                    <page string="Conditions">
+                                        <field name="condition_ids" nolabel="1" colspan="4">
+                                            <tree string="Conditions">
+                                                <field name="name"/>
+                                                <field name="model_id"/>
+                                                <field name="model_states"/>
+                                            </tree>
+                                            <form string="Condition">
+                                                <field name="name"/>
+                                                <field name="model_id"/>
+                                                <newline/>
+                                                <field name="model_states" colspan="4"/>
+                                            </form>
+                                        </field>
+                                    </page>
                                     <page string="Extra Information">
                                         <field name="note" nolabel="1" colspan="4"/>
                                     </page>
                                 </notebook>
-                            </form>                            
+                            </form>
                         </field>
                     </page>
                     <page string="Extra Information">
@@ -109,6 +124,113 @@
         action="action_process_form"
         parent="menu_process"/>
 
+    <!-- Nodes -->
+    <record model="ir.ui.view" id="view_process_node_tree">
+        <field name="name">process.node.tree</field>
+        <field name="model">process.node</field>
+        <field name="type">tree</field>
+        <field name="arch" type="xml">
+            <tree string="Process Nodes">
+                <field name="name"/>      
+                <field name="process_id" select="1"/>          
+                <field name="model_id" select="1"/>
+                <field name="kind" select="1"/>
+                <field name="flow_start"/>
+            </tree>
+        </field>
+    </record>
+
+    <record model="ir.ui.view" id="view_process_node_form">
+        <field name="name">process.node.form</field>
+        <field name="model">process.node</field>
+        <field name="type">form</field>
+        <field name="arch" type="xml">
+            <form string="Process Node">
+                <group colspan="4" string="Details">
+                    <field name="name" select="1"/>
+                    <field name="flow_start"/>                                    
+                    <field name="process_id"/>
+                    <newline/>                                    
+                    <field name="model_id" select="1"/>
+                    <field name="menu_id" select="2"/>                                    
+                    <newline/>
+                    <field name="kind" select="1"/>
+                    <field name="model_states"/>
+                </group>
+                <notebook colspan="4">
+                    <page string="Outgoing Transitions">
+                        <field name="transition_out" colspan="4" nolabel="1">
+                            <tree string="Transitions">
+                                <field name="name"/>
+                                <field name="target_node_id"/>
+                            </tree>
+                            <form string="Transition">
+                                <group colspan="4" string="Details">
+                                    <field name="name"/>
+                                    <newline/>
+                                    <field name="target_node_id"/>
+                                </group>
+                                <notebook colspan="4">
+                                    <page string="Buttons">
+                                        <field name="action_ids" colspan="4" nolabel="1">
+                                            <tree string="Actions">
+                                                <field name="name"/>
+                                                <field name="state"/>
+                                                <field name="action"/>
+                                            </tree>
+                                            <form string="Actions">
+                                                <field name="name" colspan="4"/>
+                                                <newline/>
+                                                <field name="state"/>
+                                                <field name="action"/>
+                                            </form>               
+                                        </field>
+                                    </page>
+                                    <page string="Roles Required">
+                                        <field name="transition_ids" colspan="4" nolabel="1"/>
+                                    </page>
+                                    <page string="Extra Information">
+                                        <field name="note" colspan="4" nolabel="1"/>
+                                    </page>
+                                </notebook>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Conditions">
+                        <field name="condition_ids" nolabel="1" colspan="4">
+                            <tree string="Conditions">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <field name="model_states"/>
+                            </tree>
+                            <form string="Condition">
+                                <field name="name"/>
+                                <field name="model_id"/>
+                                <newline/>
+                                <field name="model_states" colspan="4"/>
+                            </form>
+                        </field>
+                    </page>
+                    <page string="Extra Information">
+                        <field name="note" nolabel="1" colspan="4"/>
+                    </page>
+                </notebook>
+            </form>                                
+        </field>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_process_node_form">
+        <field name="name">Process Nodes</field>
+        <field name="res_model">process.node</field>
+        <field name="view_type">form</field>
+        <field name="view_mode">tree,form</field>
+    </record>
+
+    <menuitem
+        id="menu_process_node_form"
+        action="action_process_node_form"
+        parent="menu_process"/>
+
     <!-- Transitions -->
 
     <record model="ir.ui.view" id="view_process_transition_tree">