[MERGE] trunk

bzr revid: al@openerp.com-20121002220720-z0rjvmjx8kvy52zh

1 files changed, 1 insertions, 9 deletions

diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py
index 5ef7f3013e8..7e7282eb231 100644
--- a/addons/web/controllers/main.py
+++ b/addons/web/controllers/main.py
@@ -1602,13 +1602,6 @@ class Binary(openerpweb.Controller):
 class Action(openerpweb.Controller):
     _cp_path = "/web/action"
 
-    # For most actions, the type attribute and the model name are the same, but
-    # there are exceptions. This dict is used to remap action type attributes
-    # to the "real" model name when they differ.
-    action_mapping = {
-        "ir.actions.act_url": "ir.actions.url",
-    }
-
     @openerpweb.jsonrequest
     def load(self, req, action_id, do_not_eval=False):
         Actions = req.session.model('ir.actions.actions')
@@ -1632,8 +1625,7 @@ class Action(openerpweb.Controller):
             if action_type == 'ir.actions.report.xml':
                 ctx.update({'bin_size': True})
             ctx.update(context)
-            action_model = self.action_mapping.get(action_type, action_type)
-            action = req.session.model(action_model).read([action_id], False, ctx)
+            action = req.session.model(action_type).read([action_id], False, ctx)
             if action:
                 value = clean_action(req, action[0], do_not_eval)
         return {'result': value}