Nicolas Vanhoren (OpenERP) has proposed merging
lp:~openerp-dev/openerp-web/6.1-1003923-niv into lp:openerp-web/6.1.
Requested reviews:
OpenERP Core Team (openerp)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-1003923-niv/+merge/109155
Fix the bug about actions url
--
https://code.launchpad.net/~openerp-dev/openerp-web/6.1-1003923-niv/+merge/109155
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/6.1-1003923-niv.
=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py 2012-06-06 12:35:08 +0000
+++ addons/web/controllers/main.py 2012-06-07 14:11:25 +0000
@@ -1510,6 +1510,10 @@
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 @@
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}
_______________________________________________
Mailing list: https://launchpad.net/~openerp-dev-gtk
Post to : [email protected]
Unsubscribe : https://launchpad.net/~openerp-dev-gtk
More help : https://help.launchpad.net/ListHelp
