audrius/web
1
0
Fork 1
mirror of https://github.com/OCA/web.git synced 2025-02-22 13:21:25 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge PR #2134 into 12.0

Browse Source 
Signed-off-by tarteo
This commit is contained in:
OCA-git-bot
2022-02-23 13:09:09 +00:00
parent 2454eecda5 2936185931
commit 3131045bea
2 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
web_edit_user_filter/static/src/js/backend.js
View File

@@ -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;
}

10
web_edit_user_filter/static/src/xml/backend.xml
View File

@@ -7,8 +7,14 @@
<div class="list-group">
<t t-foreach="values" t-as="value">
<a class="list-group-item list-group-item-action"
t-attf-data-value="#{typeof value.value === 'object' ? value.value.attrs.domain : value.value}">
<t t-if="value.value">
<t t-set="data" t-value="typeof value.value === 'object' ? value.value.attrs.domain : value.value"/>
</t>
<t t-else="">
<!-- Use label if no value exists for this filter (eg: pivot time range) -->
<t t-set="data" t-value="value.label"/>
</t>
<a class="list-group-item list-group-item-action" t-attf-data-value="#{data}">
<span>
<t t-esc="value.label"/>
</span>