summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/view_manager.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-10-17 15:17:48 +0200
committerChristophe Simonis <chs@odoo.com>2016-10-17 15:17:48 +0200
commite8e4145c998c335d00a48a0b2a7a9e961b3f3983 (patch)
tree3433987f901989e6103f30d165580a87ce4f658f /addons/web/static/src/js/view_manager.js
parent81ec36a709188e1e8fe0fb28e0673396d9b51e4d (diff)
parentba6ca788fd80a1b963b8059bd287317399389283 (diff)
[MERGE] forward port branch saas-11 up to ba6ca78
Diffstat (limited to 'addons/web/static/src/js/view_manager.js')
-rw-r--r--addons/web/static/src/js/view_manager.js3
1 files changed, 3 insertions, 0 deletions
diff --git a/addons/web/static/src/js/view_manager.js b/addons/web/static/src/js/view_manager.js
index 6a8a162e144..ec7ce95313a 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -458,6 +458,9 @@ var ViewManager = Widget.extend(ControlPanelMixin, {
}
},
do_load_state: function(state, warm) {
+ if (state.view_type && state.view_type !== this.active_view.type) {
+ this.switch_mode(state.view_type, true);
+ }
this.active_view.controller.do_load_state(state, warm);
},
});