From 68eefe3ceece70919cb03c77ec187f7b84ece172 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?G=C3=A9ry=20Debongnie?= Date: Tue, 11 Dec 2018 13:51:04 +0000 Subject: [PATCH] [FIX] web: do not render invisible filters in search view In some cases, the web client may receive a search view with invisible filters. This is due to the way field_view_get works. For example, if there is a group on a filter, then this will be transformed into an invisible attribute. In that case, the search view should simply ignore the filter and not display it. This was broken in the recent control panel refactoring (note that the search view lacked the possibility of testing that kind of situation). closes odoo/odoo#29430 cherry-pick of 13aae100e2bc0589e2313fd4105b39c0eeea4db0 closes odoo/odoo#29965 --- .../views/control_panel/control_panel_view.js | 3 +++ .../static/tests/views/control_panel_tests.js | 23 +++++++++++++++++++ 2 files changed, 26 insertions(+) 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 0d842c4182d..381e5dcf7e5 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 @@ -197,6 +197,9 @@ var ControlPanelView = Factory.extend({ var groupNumber = 1; _.each(preFilters, function (preFilter) { + if (preFilter.attrs && preFilter.attrs.invisible) { + return; + } if (preFilter.tag !== currentTag || _.contains(['separator', 'field'], preFilter.tag)) { if (currentGroup.length) { if (currentTag === 'groupBy') { diff --git a/addons/web/static/tests/views/control_panel_tests.js b/addons/web/static/tests/views/control_panel_tests.js index 513cdb32e08..08cc1391719 100644 --- a/addons/web/static/tests/views/control_panel_tests.js +++ b/addons/web/static/tests/views/control_panel_tests.js @@ -330,5 +330,28 @@ QUnit.module('Views', { "there should be two groups of a single field" ); }); + + QUnit.module('Control Panel Rendering'); + + QUnit.test('invisible filters are not rendered', async function (assert) { + assert.expect(2); + var controlPanel = await createControlPanel({ + model: 'partner', + arch: "" + + "" + + "" + + "", + data: this.data, + searchMenuTypes: ['filter'], + context: { + search_disable_custom_filters: true, + }, + }); + testUtils.dom.click(controlPanel.$('.o_filters_menu_button')); + assert.containsOnce(controlPanel, '.o_menu_item a:contains("A")'); + assert.containsNone(controlPanel, '.o_menu_item a:contains("B")'); + + controlPanel.destroy(); + }); }); });