summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/chrome/web_client.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2018-03-20 11:45:11 +0100
committerChristophe Simonis <chs@odoo.com>2018-03-20 11:45:11 +0100
commite0345a4a3f4cfa8f4de8723c6b72b741b06483a1 (patch)
tree5ad51dbebfd89cd7e56bf12df2da3ecf4d8e9509 /addons/web/static/src/js/chrome/web_client.js
parente9db6b6d9de1e0589e8871ca2e5e8dde8ec8cab7 (diff)
parent2835d299792ffa925d86ad3460057be713ac4fac (diff)
[MERGE] forward port branch 11.0 up to 2835d299792
Diffstat (limited to 'addons/web/static/src/js/chrome/web_client.js')
-rw-r--r--addons/web/static/src/js/chrome/web_client.js4
1 files changed, 2 insertions, 2 deletions
diff --git a/addons/web/static/src/js/chrome/web_client.js b/addons/web/static/src/js/chrome/web_client.js
index 76aadf49463..db440cd742f 100644
--- a/addons/web/static/src/js/chrome/web_client.js
+++ b/addons/web/static/src/js/chrome/web_client.js
@@ -135,7 +135,7 @@ return AbstractWebClient.extend({
self.action_manager.loadState(state, !!self._current_state).then(function () {
var action = self.action_manager.getCurrentAction();
if (action) {
- self.menu.open_action(action.id);
+ self.menu.open_action(action.id, state.menu_id);
}
});
}
@@ -156,7 +156,7 @@ return AbstractWebClient.extend({
var completed = $.Deferred();
self.action_manager.doAction(result, {
clear_breadcrumbs: true,
- action_menu_id: self.menu.current_menu,
+ action_menu_id: options.id,
}).fail(function() {
self.menu.open_menu(options.previous_menu_id);
}).always(function() {