diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index f5c31b2d1bf..b3acbbe5119 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1422,7 +1422,7 @@ class Action(openerpweb.Controller): except Exception: action_id = 0 # force failed read - base_action = Actions.read([action_id], ['name', 'type'], req.session.get_context()) + base_action = Actions.read([action_id], ['type'], req.context) if base_action: ctx = {} action_type = base_action[0]['type'] @@ -1431,7 +1431,7 @@ class Action(openerpweb.Controller): ctx.update(req.context) action = req.session.model(action_type).read([action_id], False, ctx) if action: - value = clean_action(req, dict(action[0], **base_action[0])) + value = clean_action(req, action[0]) return value @openerpweb.jsonrequest diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index 5fa3c8fb290..5ae8bfc79fc 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1220,7 +1220,8 @@ instance.web.Sidebar = instance.web.Widget.extend({ sidebar_eval_context, active_ids_context)); self.rpc("/web/action/load", { action_id: item.action.id, - context: c + context: new instance.web.CompoundContext( + self.dataset.get_context(), active_ids_context).eval() }).done(function(result) { result.context = new instance.web.CompoundContext( result.context || {}, active_ids_context)