diff options
| author | Denis Ledoux <dle@odoo.com> | 2015-02-20 16:43:15 +0100 |
|---|---|---|
| committer | Denis Ledoux <dle@odoo.com> | 2015-02-20 16:43:15 +0100 |
| commit | b0be8dfdfd78c7953c1f60bf86b862bc46abd65c (patch) | |
| tree | 809f773fb0e15134bbf7aa491de566f1136e6ee2 /addons/web | |
| parent | a9ba27b79f563088f84667d5d1b405e5e87a369b (diff) | |
| parent | aae75f1e297cb6b370bac7341f54f310923fe5dc (diff) | |
[MERGE] forward port of branch saas-3 up to aae75f1
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/controllers/main.py | 4 | ||||
| -rw-r--r-- | addons/web/static/src/js/views.js | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/addons/web/controllers/main.py b/addons/web/controllers/main.py index 563d6a85084..c652e678a34 100644 --- a/addons/web/controllers/main.py +++ b/addons/web/controllers/main.py @@ -1240,7 +1240,7 @@ class Action(http.Controller): except Exception: action_id = 0 # force failed read - base_action = Actions.read([action_id], ['name', 'type'], request.context) + base_action = Actions.read([action_id], ['type'], request.context) if base_action: ctx = request.context action_type = base_action[0]['type'] @@ -1250,7 +1250,7 @@ class Action(http.Controller): ctx.update(additional_context) action = request.session.model(action_type).read([action_id], False, ctx) if action: - value = clean_action(dict(action[0], **base_action[0])) + value = clean_action(action[0]) return value @http.route('/web/action/run', type='json', auth="user") diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js index e594c428055..16d578341a7 100644 --- a/addons/web/static/src/js/views.js +++ b/addons/web/static/src/js/views.js @@ -1288,7 +1288,8 @@ instance.web.Sidebar = instance.web.Widget.extend({ 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) |