[MERGE] forward port branch saas-11 up to ba6ca78

3 files changed, 33 insertions, 18 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);
     },
 });
diff --git a/addons/web/static/src/js/views/list_view.js b/addons/web/static/src/js/views/list_view.js
index 39aa8930eac..aece38b9d71 100644
--- a/addons/web/static/src/js/views/list_view.js
+++ b/addons/web/static/src/js/views/list_view.js
@@ -1733,7 +1733,7 @@ var Column = Class.extend({
         }
 
         var aggregation_func = (this.sum && 'sum') || (this.avg && 'avg') ||
-                               (this.max && 'max') || (this.min && 'min') || this.group_operator;
+                               (this.max && 'max') || (this.min && 'min');
 
         if (!aggregation_func) {
             return {};
diff --git a/addons/web/static/src/js/web_client.js b/addons/web/static/src/js/web_client.js
index 8157270638e..a364e2a2de3 100644
--- a/addons/web/static/src/js/web_client.js
+++ b/addons/web/static/src/js/web_client.js
@@ -112,25 +112,37 @@ return AbstractWebClient.extend({
         }
     },
     on_hashchange: function(event) {
+        if (this._ignore_hashchange) {
+            this._ignore_hashchange = false;
+            return;
+        }
+
         var self = this;
-        var stringstate = event.getState(false);
-        if (!_.isEqual(this._current_state, stringstate)) {
-            var state = event.getState(true);
-            if(!state.action && state.menu_id) {
-                self.menu.is_bound.done(function() {
-                    self.menu.menu_click(state.menu_id);
-                });
-            } else {
-                state._push_me = false;  // no need to push state back...
-                this.action_manager.do_load_state(state, !!this._current_state).then(function () {
-                    var action = self.action_manager.get_inner_action();
-                    if (action) {
-                        self.menu.open_action(action.action_descr.id);
-                    }
-                });
+        this.clear_uncommitted_changes().then(function () {
+            var stringstate = event.getState(false);
+            if (!_.isEqual(self._current_state, stringstate)) {
+                var state = event.getState(true);
+                if(!state.action && state.menu_id) {
+                    self.menu.is_bound.done(function() {
+                        self.menu.menu_click(state.menu_id);
+                    });
+                } else {
+                    state._push_me = false;  // no need to push state back...
+                    self.action_manager.do_load_state(state, !!self._current_state).then(function () {
+                        var action = self.action_manager.get_inner_action();
+                        if (action) {
+                            self.menu.open_action(action.action_descr.id);
+                        }
+                    });
+                }
             }
-        }
-        this._current_state = stringstate;
+            self._current_state = stringstate;
+        }, function () {
+            if (event) {
+                self._ignore_hashchange = true;
+                window.location = event.originalEvent.oldURL;
+            }
+        });
     },
     on_menu_action: function(options) {
         var self = this;