diff --git a/addons/web/static/src/js/views/search/search_view.js b/addons/web/static/src/js/views/search/search_view.js index e776e5b0467..145268622fe 100644 --- a/addons/web/static/src/js/views/search/search_view.js +++ b/addons/web/static/src/js/views/search/search_view.js @@ -445,9 +445,9 @@ var SearchView = Widget.extend({ self.timeRangeMenu = self._createTimeRangeMenu(); menu_defs.push(self.timeRangeMenu.prependTo($buttons)); self.timeRangeMenu.do_hide(); - var display = self.options.disableTimeRangeMenu !== undefined && + self.displayedTimeRangeMenu = self.options.disableTimeRangeMenu !== undefined && !self.options.disableTimeRangeMenu; - self.displayTimeRangeMenu(display); + self.displayTimeRangeMenu(self.displayedTimeRangeMenu); if (!self.options.disable_groupby) { self.groupby_menu = self._createGroupByMenu(); menu_defs.push(self.groupby_menu.prependTo($buttons)); @@ -736,7 +736,7 @@ var SearchView = Widget.extend({ } if (self.filters_menu) { self.filters_menu.updateItemsStatus(activeItemIds.filterCategory); } - if (self.timeRangeMenu && !timeRangeMenuIsActive) { + if (self.displayedTimeRangeMenu && !timeRangeMenuIsActive) { self.timeRangeMenu.deactivate(); } }); diff --git a/addons/web/static/tests/views/search_view_tests.js b/addons/web/static/tests/views/search_view_tests.js index 13ec4cab9d5..9b1248bb309 100644 --- a/addons/web/static/tests/views/search_view_tests.js +++ b/addons/web/static/tests/views/search_view_tests.js @@ -635,5 +635,34 @@ QUnit.module('Search View', { actionManager.destroy(); }); + + QUnit.test('time range menu stays hidden', function (assert) { + assert.expect(6); + + var actionManager = createActionManager({ + actions: this.actions, + archs: this.archs, + data: this.data, + }); + + actionManager.doAction(1); + + // check that the fifth dropdown is the time range menu and is hidden + assert.ok($('.btn-group.o_dropdown').eq(4).hasClass('o_hidden')); + assert.ok($('.btn-group.o_dropdown').eq(4).children().eq(1).hasClass('o_time_range_menu')); + // check if search view has no facets + assert.strictEqual($('.o_facet_values').length, 0); + + // activate groupby + $('button .fa-bars').click(); + $('.o_menu_item a').eq(0).click(); + // check that there is a facet + assert.strictEqual($('div.o_facet_values').length, 1); + // check that the fifth dropdown is the time range menu and is still hidden + assert.ok($('.btn-group.o_dropdown').eq(4).hasClass('o_hidden')); + assert.ok($('.btn-group.o_dropdown').eq(4).children().eq(1).hasClass('o_time_range_menu')); + actionManager.destroy(); + }); + }); });