[MERGE] forward port branch saas-17 up to 3d4238f71e4

2 files changed, 9 insertions, 1 deletions

diff --git a/addons/web/static/src/js/chrome/search_menus.js b/addons/web/static/src/js/chrome/search_menus.js
index 1da7800b049..eee7303ffbd 100644
--- a/addons/web/static/src/js/chrome/search_menus.js
+++ b/addons/web/static/src/js/chrome/search_menus.js
@@ -122,6 +122,7 @@ return Widget.extend({
             model_id: this.target_model,
             context: results.context,
             domain: results.domain,
+            sort: JSON.stringify(this.searchview.dataset._sort),
             is_default: default_filter,
             action_id: this.action_id,
         };
@@ -243,6 +244,13 @@ return Widget.extend({
         }
         this.query.reset([this.facet_for(filter)], {
             preventSearch: preventSearch || false});
+
+        // Load sort settings on view
+        if (!_.isUndefined(filter.sort)){
+            var sort_items = JSON.parse(filter.sort);
+            this.searchview.dataset.set_sort(sort_items);
+        }
+
         this.$filters[this.key_for(filter)].addClass('selected');
     },
     remove_filter: function (filter, $filter, key) {
diff --git a/addons/web/static/src/js/chrome/search_view.js b/addons/web/static/src/js/chrome/search_view.js
index 26305817e55..6c3adcafcca 100644
--- a/addons/web/static/src/js/chrome/search_view.js
+++ b/addons/web/static/src/js/chrome/search_view.js
@@ -232,7 +232,7 @@ var SearchView = Widget.extend({
         'click .o_searchview_more': function (e) {
             $(e.target).toggleClass('fa-search-plus fa-search-minus');
             var visibleSearchMenu = this.call('local_storage', 'getItem', 'visible_search_menu');
-            this.call('local_storage', 'setItem', visibleSearchMenu !== 'true');
+            this.call('local_storage', 'setItem', 'visible_search_menu', visibleSearchMenu !== 'true');
             this.toggle_buttons();
         },
         'keydown .o_searchview_input, .o_searchview_facet': function (e) {