Merge lp:~openerp-dev/openobject-server/trunk-eval-action-context-pna into lp:openobject-server

[Richard Mathot (Odoo, formerly OpenERP)]

[lp:~openerp-dev/openobject-server/trunk-eval-action-context-pna]

5154. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-23

[MERGE] from trunk

[Richard Mathot (Odoo, formerly OpenERP) (rim-openerp)]

Seems very suspect

review: Disapprove

Unmerged revisions

5154. By Richard Mathot (Odoo, formerly OpenERP) on 2014-04-23

[MERGE] from trunk

5153. By Pinakin Nayi (OpenERP) on 2014-04-08

[Merge]with trunk

5152. By Pinakin Nayi (OpenERP) on 2014-04-03

[Merge]with trunk

5151. By Pinakin Nayi (OpenERP) on 2014-04-01

[MERGE]with main

5150. By Pinakin Nayi (OpenERP) on 2014-03-27

[IMP]act_window: eval context and append in result

=== modified file 'openerp/addons/base/ir/ir_actions.py'
--- openerp/addons/base/ir/ir_actions.py	2014-04-07 17:46:28 +0000
+++ openerp/addons/base/ir/ir_actions.py	2014-04-23 09:58:28 +0000
@@ -306,24 +306,29 @@
             ids = [ids]
         results = super(ir_actions_act_window, self).read(cr, uid, ids, fields=fields, context=context, load=load)
 
-        if not fields or 'help' in fields:
-            context = dict(context or {})
-            eval_dict = {
-                'active_model': context.get('active_model'),
-                'active_id': context.get('active_id'),
-                'active_ids': context.get('active_ids'),
-                'uid': uid,
-            }
-            for res in results:
-                model = res.get('res_model')
-                if model and self.pool.get(model):
-                    try:
-                        with tools.mute_logger("openerp.tools.safe_eval"):
-                            eval_context = eval(res['context'] or "{}", eval_dict) or {}
-                    except Exception:
-                        continue
+        context = dict(context or {})
+        eval_dict = {
+            'active_model': context.get('active_model'),
+            'active_id': context.get('active_id'),
+            'active_ids': context.get('active_ids'),
+            'uid': uid,
+            'context': context,
+        }
+        for res in results:
+            model = res.get('res_model')
+            model_obj = model and self.pool.get(model) or False
+            if model_obj:
+                try:
+                    with tools.mute_logger("openerp.tools.safe_eval"):
+                        eval_context = eval(res['context'] or "{}", eval_dict) or {}
+                except Exception:
+                    continue
+                if res.get('context') and context and context.get('active_model'):
+                    custom_context = dict(**eval_context)
+                    res['context'] = str(custom_context) 
+                if not fields or 'help' in fields:
                     custom_context = dict(context, **eval_context)
-                    res['help'] = self.pool.get(model).get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
+                    res['help'] = model_obj.get_empty_list_help(cr, uid, res.get('help', ""), context=custom_context)
         if ids_int:
             return results[0]
         return results