From 2936185931901818d781eeaab6b17c6c8d1f54ca Mon Sep 17 00:00:00 2001 From: Yann Papouin Date: Thu, 27 Jan 2022 10:54:50 +0100 Subject: [PATCH] [FIX] web_edit_user_filter: Use filter label when no value is set https://github.com/OCA/web/issues/1261 --- web_edit_user_filter/static/src/js/backend.js | 4 ++++ web_edit_user_filter/static/src/xml/backend.xml | 10 ++++++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/web_edit_user_filter/static/src/js/backend.js b/web_edit_user_filter/static/src/js/backend.js index 3f5ab7244..e6014e57b 100644 --- a/web_edit_user_filter/static/src/js/backend.js +++ b/web_edit_user_filter/static/src/js/backend.js @@ -158,6 +158,10 @@ odoo.define('web_edit_user_filter', function (require) { */ _removeValue: function (model, value) { var toRemove = model.values.filter(function (v) { + if (v.attributes.value == null) { + // Use label if value is not set (eg: pivot time range) + return v.attributes.label === value; + } if (typeof v.attributes.value === 'object') { return v.attributes.value.attrs.domain === value; } diff --git a/web_edit_user_filter/static/src/xml/backend.xml b/web_edit_user_filter/static/src/xml/backend.xml index 4863903ba..93e867334 100644 --- a/web_edit_user_filter/static/src/xml/backend.xml +++ b/web_edit_user_filter/static/src/xml/backend.xml @@ -7,8 +7,14 @@
- + + + + + + + +