[FIX] ir_action: read ir.actions.act_window

bzr revid: chm@openerp.com-20130205112258-heruqrx53dahqi02
This commit is contained in:
Christophe Matthieu
2013-02-05 12:22:58 +01:00
parent 3da294f56a
commit ec02389784
+3 -2
View File
@@ -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