diff options
| author | Dharmang Soni <dpr@odoo.com> | 2019-07-23 09:41:30 +0000 |
|---|---|---|
| committer | Martin Geubelle <mge@odoo.com> | 2019-08-07 07:23:15 +0000 |
| commit | 7c95dbf36664988a883f84a8f60026039c0fb664 (patch) | |
| tree | 2213eba54c61a239e7e5868c5919679283ca01b8 /addons/web/static/src | |
| parent | 3c134293b69d539d1e3047f96bff1b52bc391452 (diff) | |
[IMP] web: allow `invisible` filters to be used
Before this rev. `invisible` filters in the search view were not
considered at all.
Now the filters are still invisible from the user POV, but they are
still accesible via context and can be applied on search.
Related of task 2036392
Diffstat (limited to 'addons/web/static/src')
| -rw-r--r-- | addons/web/static/src/js/views/control_panel/control_panel_view.js | 6 | ||||
| -rw-r--r-- | addons/web/static/src/xml/base.xml | 4 |
2 files changed, 5 insertions, 5 deletions
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 c15840714db..bd7c4110a26 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 @@ -170,6 +170,9 @@ var ControlPanelView = Factory.extend({ DEFAULT_PERIOD; filter.currentOptionId = false; } + if (attrs.invisible) { + filter.invisible = true; + } } else if (filter.type === 'groupBy') { filter.fieldName = attrs.fieldName; filter.fieldType = this.fields[attrs.fieldName].type; @@ -224,9 +227,6 @@ var ControlPanelView = Factory.extend({ _.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/src/xml/base.xml b/addons/web/static/src/xml/base.xml index 743187bf624..c075c912784 100644 --- a/addons/web/static/src/xml/base.xml +++ b/addons/web/static/src/xml/base.xml @@ -1012,8 +1012,8 @@ <t t-if="widget.items.length !== 0"> <t t-set="group" t-value="0"/> <t t-foreach="widget.items" t-as="item"> - <div t-if="group !== item.groupNumber" role="separator" class="dropdown-divider" data-removable="1"/> - <div class="o_menu_item" + <div t-if="group !== item.groupNumber and !item.invisible" role="separator" class="dropdown-divider" data-removable="1"/> + <div t-attf-class="o_menu_item #{item.invisible ? 'd-none' : ''}" t-att-data-id="item.id"> <a role="menuitem" href="#" t-attf-class="dropdown-item#{item.isActive ? ' selected ' : ''}"> <t t-esc="item.description"/> |