From ec02389784ab1a41d91ab8df6d53c953444e86b4 Mon Sep 17 00:00:00 2001 From: Christophe Matthieu Date: Tue, 5 Feb 2013 12:22:58 +0100 Subject: [PATCH] [FIX] ir_action: read ir.actions.act_window bzr revid: chm@openerp.com-20130205112258-heruqrx53dahqi02 --- openerp/addons/base/ir/ir_actions.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/openerp/addons/base/ir/ir_actions.py b/openerp/addons/base/ir/ir_actions.py index 841e16af01c..aae45805502 100644 --- a/openerp/addons/base/ir/ir_actions.py +++ b/openerp/addons/base/ir/ir_actions.py @@ -265,7 +265,7 @@ class act_window(osv.osv): results = super(act_window, self).read(cr, uid, ids, fields=fields, context=context, load=load) if not fields or 'help' in fields: - context = dict(context) + context = dict(context or {}) dic = { 'active_model' : context.get('active_model', None), 'active_id' : context.get('active_id', None), @@ -273,7 +273,8 @@ class act_window(osv.osv): } for res in results: if res.get('res_model', False): - res['help'] = self.pool.get(res.get('res_model')).dynamic_help(cr, uid, res.get('help', ""), context=dict(context, **eval(res['context'], dic))) + custom_context = dict(context.items() + (eval(res['context'] or "{}", dic) or {}).items()) + res['help'] = self.pool.get(res.get('res_model')).dynamic_help(cr, uid, res.get('help', ""), context=custom_context) return results