Xavier (Open ERP) has proposed merging
lp:~openerp-dev/openerp-web/trunk-rename-url-action-xmo into lp:openerp-web.
Requested reviews:
OpenERP R&D Web Team (openerp-dev-web)
For more details, see:
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-rename-url-action-xmo/+merge/109338
See
https://code.launchpad.net/~openerp-dev/openobject-server/trunk-rename-url-action-xmo/+merge/109337
--
https://code.launchpad.net/~openerp-dev/openerp-web/trunk-rename-url-action-xmo/+merge/109338
Your team OpenERP R&D Team is subscribed to branch
lp:~openerp-dev/openerp-web/trunk-rename-url-action-xmo.
=== modified file 'addons/web/controllers/main.py'
--- addons/web/controllers/main.py 2012-06-07 13:54:12 +0000
+++ addons/web/controllers/main.py 2012-06-08 12:03:22 +0000
@@ -1467,10 +1467,6 @@
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):
@@ -1483,9 +1479,7 @@
if action_type[0]['type'] == 'ir.actions.report.xml':
ctx.update({'bin_size': True})
ctx.update(context)
- 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)
+ action = req.session.model(action_type[0]['type']).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
