diff options
| author | Martin Geubelle <mge@odoo.com> | 2018-12-13 19:32:55 +0000 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2018-12-17 10:39:03 +0000 |
| commit | ae2dbc60c5c4e23a840f79071d81f2d4c0b3fa21 (patch) | |
| tree | b47c50c058074bbf2cab716437e9922e4626daea /addons/web/static/src/js/views/control_panel | |
| parent | 0794a3c95623402fb7579ca7e7465e62fa7e9669 (diff) | |
[FIX] web: handle `context` in ControlPanel <filter>
The `context` key wasn't correctly taken into account when computing the search
query for `filter``tags.
It is now correctly handled.
Task 1917628
closes odoo/odoo#29529
Diffstat (limited to 'addons/web/static/src/js/views/control_panel')
| -rw-r--r-- | addons/web/static/src/js/views/control_panel/control_panel_model.js | 5 | ||||
| -rw-r--r-- | addons/web/static/src/js/views/control_panel/control_panel_view.js | 2 |
2 files changed, 3 insertions, 4 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 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_view.js b/addons/web/static/src/js/views/control_panel/control_panel_view.js index 3f89ad9f637..edda0e3c9ac 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 @@ -143,6 +143,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; @@ -198,6 +199,7 @@ var ControlPanelView = Factory.extend({ var groupOfGroupBys = []; var groupNumber = 1; + _.each(preFilters, function (preFilter) { if (preFilter.attrs && preFilter.attrs.invisible) { return; |
