NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-12-20 12:22:23 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixes #2684: Fix custom field filtering

Browse Source
This commit is contained in:
Jeremy Stretch
2018-12-12 16:06:50 -05:00
parent 2418fed65b
commit edd763b1aa
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
netbox/extras/filters.py
View File

@@ -31,12 +31,12 @@ class CustomFieldFilter(django_filters.Filter):
# Treat 0 as None
if int(value) == 0:
return queryset.exclude(
custom_field_values__field__name=self.name,
custom_field_values__field__name=self.field_name,
)
# Match on exact CustomFieldChoice PK
else:
return queryset.filter(
custom_field_values__field__name=self.name,
custom_field_values__field__name=self.field_name,
custom_field_values__serialized_value=value,
)
except ValueError:
@@ -45,12 +45,12 @@ class CustomFieldFilter(django_filters.Filter):
# Apply the assigned filter logic (exact or loose)
if self.cf_type == CF_TYPE_BOOLEAN or self.filter_logic == CF_FILTER_EXACT:
queryset = queryset.filter(
custom_field_values__field__name=self.name,
custom_field_values__field__name=self.field_name,
custom_field_values__serialized_value=value
)
else:
queryset = queryset.filter(
custom_field_values__field__name=self.name,
custom_field_values__field__name=self.field_name,
custom_field_values__serialized_value__icontains=value
)