From 629ffe93702cb9eb691c9036c091ee1cc848a2f1 Mon Sep 17 00:00:00 2001 From: niv-openerp Date: Thu, 7 Jun 2012 16:08:22 +0200 Subject: [PATCH] fixed bug with ir.actions.url bzr revid: nicolas.vanhoren@openerp.com-20120607140822-bsljpmaqnbg5m2pm --- addons/web/controllers/main.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 3cb18e4fca7..d2250884c1e 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1510,6 +1510,10 @@ class Binary(openerpweb.Controller): class Action(openerpweb.Controller): _cp_path = "/web/action" + + action_mapping = { + "ir.actions.act_url": "ir.actions.url", + } @openerpweb.jsonrequest def load(self, req, action_id, do_not_eval=False): @@ -1522,7 +1526,9 @@ class Action(openerpweb.Controller): if action_type[0]['type'] == 'ir.actions.report.xml': ctx.update({'bin_size': True}) ctx.update(context) - action = req.session.model(action_type[0]['type']).read([action_id], False, ctx) + action_model = action_type[0]['type'] + action_model = Action.action_mapping.get(action_model, action_model) + action = req.session.model(action_model).read([action_id], False, ctx) if action: value = clean_action(req, action[0], do_not_eval) return {'result': value}