[MERGE] forward port branch saas-12.1 up to 8aa8548d8ab

4 files changed, 8 insertions, 10 deletions

diff --git a/addons/web/static/src/js/views/control_panel/control_panel_controller.js b/addons/web/static/src/js/views/control_panel/control_panel_controller.js
index 991cee949e8..3d6e62f4bf9 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_controller.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_controller.js
@@ -160,12 +160,11 @@ var ControlPanelController = mvc.Controller.extend({
      */
     _onFacetRemoved: function (ev) {
         ev.stopPropagation();
-        var group = ev.data.group;
-        if (!group) {
-            group = this.renderer.getLastFacet();
+        var group = ev.data.group || this.renderer.getLastFacet();
+        if (group) {
+            this.model.deactivateGroup(group.id);
+            this._reportNewQueryAndRender();
         }
-        this.model.deactivateGroup(group.id);
-        this._reportNewQueryAndRender();
     },
     /**
      * @private
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_model.js b/addons/web/static/src/js/views/control_panel/control_panel_model.js
index 9353022eacf..67b1a4c64f8 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_model.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_model.js
@@ -645,10 +645,7 @@ var ControlPanelModel = mvc.Model.extend({
      * @returns {Object} context
      */
     _getFilterContext: function (filter) {
-        var context = {};
-        if (filter.type === 'favorite') {
-            _.extend(context, filter.context);
-        }
+        var context = filter.context || {};
         // the following code aims to restore this:
         // https://github.com/odoo/odoo/blob/master/addons/web/static/src/js/views/search/search_inputs.js#L498
         // this is required for the helpdesk tour to pass
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_renderer.js b/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
index eea7fdae430..665fe73bf7d 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_renderer.js
@@ -102,7 +102,7 @@ var ControlPanelRenderer = Renderer.extend({
     //--------------------------------------------------------------------------
 
     /**
-     * @returns {Object}
+     * @returns {Object|undefined}
      */
     getLastFacet: function () {
         return this.state.facets.slice(-1)[0];
diff --git a/addons/web/static/src/js/views/control_panel/control_panel_view.js b/addons/web/static/src/js/views/control_panel/control_panel_view.js
index 381e5dcf7e5..2bde26340e7 100644
--- a/addons/web/static/src/js/views/control_panel/control_panel_view.js
+++ b/addons/web/static/src/js/views/control_panel/control_panel_view.js
@@ -141,6 +141,7 @@ var ControlPanelView = Factory.extend({
                                 'Ω';
         if (filter.type === 'filter') {
             filter.domain = attrs.domain;
+            filter.context = pyUtils.eval('context', attrs.context);
             if (attrs.date) {
                 filter.fieldName = attrs.date;
                 filter.fieldType = this.fields[attrs.date].type;
@@ -196,6 +197,7 @@ var ControlPanelView = Factory.extend({
         var groupOfGroupBys = [];
         var groupNumber = 1;
 
+
         _.each(preFilters, function (preFilter) {
             if (preFilter.attrs && preFilter.attrs.invisible) {
                 return;