diff options
Diffstat (limited to 'addons/web/static/src/js/chrome')
| -rw-r--r-- | addons/web/static/src/js/chrome/action_manager_act_window.js | 13 | ||||
| -rw-r--r-- | addons/web/static/src/js/chrome/control_panel.js | 7 |
2 files changed, 15 insertions, 5 deletions
diff --git a/addons/web/static/src/js/chrome/action_manager_act_window.js b/addons/web/static/src/js/chrome/action_manager_act_window.js index 1ab4367de4c..2490cf0da57 100644 --- a/addons/web/static/src/js/chrome/action_manager_act_window.js +++ b/addons/web/static/src/js/chrome/action_manager_act_window.js @@ -528,15 +528,22 @@ ActionManager.include({ group_by_seq: groupbys || [], eval_context: this.userContext, }); + var groupBy = results.group_by.length ? + results.group_by : + (action.context.group_by || []); + groupBy = (typeof groupBy === 'string') ? [groupBy] : groupBy; + if (results.error) { throw new Error(_.str.sprintf(_t("Failed to evaluate search criterions")+": \n%s", JSON.stringify(results.error))); } - var groupBy = results.group_by.length ? results.group_by : (action.context.group_by || []); + + var context = _.omit(results.context, 'time_ranges'); + return { - context: results.context, + context: context, domain: results.domain, - groupBy: (typeof groupBy === 'string') ? [groupBy] : groupBy, + groupBy: groupBy, }; }, /** diff --git a/addons/web/static/src/js/chrome/control_panel.js b/addons/web/static/src/js/chrome/control_panel.js index fb265390f51..5d0601820d0 100644 --- a/addons/web/static/src/js/chrome/control_panel.js +++ b/addons/web/static/src/js/chrome/control_panel.js @@ -170,7 +170,7 @@ var ControlPanel = Widget.extend({ // Update the searchview and switch buttons if (status.searchview || options.clear) { - this._update_search_view(status.searchview, status.search_view_hidden, status.groupable); + this._update_search_view(status.searchview, status.search_view_hidden, status.groupable, status.enableTimeRangeMenu); } if (status.active_view_selector) { this._update_switch_buttons(status.active_view_selector); @@ -266,12 +266,15 @@ var ControlPanel = Widget.extend({ * @param {boolean} [groupable] visibility of the groupable menu (only * relevant if searchview is visible) */ - _update_search_view: function (searchview, isHidden, groupable) { + _update_search_view: function (searchview, isHidden, groupable, enableTimeRangeMenu) { if (searchview) { searchview.toggle_visibility(!isHidden); if (groupable !== undefined){ searchview.groupby_menu.do_toggle(groupable); } + if (enableTimeRangeMenu !== undefined){ + searchview.displayTimeRangeMenu(enableTimeRangeMenu); + } } this.nodes.$searchview.toggle(!isHidden); this.$el.toggleClass('o_breadcrumb_full', !!isHidden); |