Skip to content

Commit 97d57ae

Browse files
committed
Update filter_has_value and characteristic_group to admin see HEA-772
1 parent d2935fe commit 97d57ae

2 files changed

Lines changed: 11 additions & 3 deletions

File tree

apps/baseline/viewsets.py

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -545,10 +545,17 @@ class Meta:
545545
)
546546

547547
def filter_has_value(self, queryset, name, value):
548+
"""
549+
Filter records based on whether they have meaningful values.
550+
"""
548551
if value:
549-
return queryset.exclude(value__isnull=True).exclude(value__exact="")
550-
else:
551-
return queryset.filter(Q(value__isnull=True) | Q(value__exact=""))
552+
return queryset.exclude(
553+
Q(value__isnull=True)
554+
| Q(value__exact="")
555+
| Q(value__exact=0)
556+
| Q(value__exact=[])
557+
| Q(value__exact={})
558+
)
552559

553560

554561
class BaselineWealthCharacteristicsValueViewSet(BaseModelViewSet):

apps/metadata/admin.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -96,6 +96,7 @@ class WealthCharacteristicAdmin(ReferenceDataAdmin):
9696
*translation_fields("name"),
9797
"aliases",
9898
*translation_fields("description"),
99+
"characteristic_group",
99100
)
100101
list_filter = ("variable_type",)
101102

0 commit comments

Comments
 (0)