diff options
| author | Mathieu Duckerts-Antoine <dam@odoo.com> | 2019-07-09 09:40:09 +0000 |
|---|---|---|
| committer | Mathieu Duckerts-Antoine <dam@odoo.com> | 2019-07-31 12:35:48 +0000 |
| commit | 1631c9dbc92b258b8cee5d0aafbd5bdb1d5ee1df (patch) | |
| tree | 2204dff13df5a188e149f72230d937eaa172b0df /addons/web | |
| parent | cfe2ee93414914d41d97f5406c8d2c5daa36cc64 (diff) | |
[FIX] web: date filter options unselected after facet deletion
Select the option 'This Month' of a date filter
in the filter menu and then remove the facet created
correctly toggles the filter from the query but the
option is still shown as selected. This commit fixes
that situation.
closes odoo/odoo#35340
Signed-off-by: VincentSchippefilt <VincentSchippefilt@users.noreply.github.com>
Diffstat (limited to 'addons/web')
| -rw-r--r-- | addons/web/static/src/js/views/control_panel/control_panel_model.js | 3 | ||||
| -rw-r--r-- | addons/web/static/tests/views/search_view_tests.js | 17 |
2 files changed, 18 insertions, 2 deletions
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 f2e28858ba3..0229daa41ee 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 @@ -157,6 +157,9 @@ var ControlPanelModel = mvc.Model.extend({ if (filter.autoCompleteValues) { filter.autoCompleteValues = []; } + if (filter.currentOptionId) { + filter.currentOptionId = false; + } }); // TODO: use toggleFilter here group.activeFilterIds = []; diff --git a/addons/web/static/tests/views/search_view_tests.js b/addons/web/static/tests/views/search_view_tests.js index 43282b52f33..f8837cdfe29 100644 --- a/addons/web/static/tests/views/search_view_tests.js +++ b/addons/web/static/tests/views/search_view_tests.js @@ -981,8 +981,8 @@ QUnit.module('Search View', { QUnit.module('Autocompletion'); - QUnit.test('selection via autocompletion modifies appropriately submenus', async function (assert) { - assert.expect(4); + QUnit.test('selection via autocompletion and deletion modifies appropriately submenus', async function (assert) { + assert.expect(6); var actionManager = await createActionManager({ actions: this.actions, @@ -1014,6 +1014,19 @@ QUnit.module('Search View', { assert.strictEqual($('.o_group_by_menu .o_item_option a.selected').text().trim(), "Day", "The item 'Day' should be selected in the groupby menu"); + await testUtils.dom.click($('div .o_searchview_facet .o_facet_remove').eq(0)); + await testUtils.dom.click($('div .o_searchview_facet .o_facet_remove').eq(0)); + + await testUtils.dom.click($('button .fa-filter')); + await testUtils.dom.click($('.o_filters_menu .o_menu_item').eq(0)); + assert.containsNone($('.o_filters_menu .o_item_option a.selected'), + "The item 'This Month' should have unselected in the filters menu"); + + await testUtils.dom.click($('button .fa-bars')); + await testUtils.dom.click($('.o_group_by_menu .o_menu_item').eq(0)); + assert.containsNone($('.o_group_by_menu .o_item_option a.selected'), + "The item 'Day' should have been unselected in the groupby menu"); + actionManager.destroy(); }); |
