summaryrefslogtreecommitdiff
path: root/addons/web/static/src/js/view_manager.js
diff options
context:
space:
mode:
authorChristophe Simonis <chs@odoo.com>2016-10-17 16:00:39 +0200
committerChristophe Simonis <chs@odoo.com>2016-10-17 16:00:39 +0200
commit53d8f76a401de522dca40471b161bf91b86a3a0e (patch)
tree8294518369751f6707d6fd68421c066069b99c50 /addons/web/static/src/js/view_manager.js
parenta9abce09c066df2a04d1c49ae719b7881ac7e175 (diff)
parente8e4145c998c335d00a48a0b2a7a9e961b3f3983 (diff)
[MERGE] forward port branch saas-12 up to e8e4145
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 4255f163068..e0d0135185f 100644
--- a/addons/web/static/src/js/view_manager.js
+++ b/addons/web/static/src/js/view_manager.js
@@ -459,6 +459,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);
},
});