NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-14 01:41:22 -06:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

Fixes #2895: Fix filtering of nullable character fields

Browse Source
This commit is contained in:
Jeremy Stretch 2019-02-14 09:43:56 -05:00
parent fdbef8ee71
commit 7a0ab3aa15
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -4,6 +4,7 @@ v2.5.7 (FUTURE)
* [#2888](https://github.com/digitalocean/netbox/issues/2888) - Correct foreground color of device roles in rack elevations * [#2888](https://github.com/digitalocean/netbox/issues/2888) - Correct foreground color of device roles in rack elevations
* [#2893](https://github.com/digitalocean/netbox/issues/2893) - Remove duplicate display of VRF RD on IP address view * [#2893](https://github.com/digitalocean/netbox/issues/2893) - Remove duplicate display of VRF RD on IP address view
* [#2895](https://github.com/digitalocean/netbox/issues/2895) - Fix filtering of nullable character fields
v2.5.6 (2019-02-13) v2.5.6 (2019-02-13)

6
netbox/utilities/filters.py
View File

@ -1,4 +1,5 @@
import django_filters import django_filters
from django.conf import settings
from django.db.models import Q from django.db.models import Q
from taggit.models import Tag from taggit.models import Tag
@ -14,12 +15,11 @@ class NullableCharFieldFilter(django_filters.CharFilter):
""" """
Allow matching on null field values by passing a special string used to signify NULL. Allow matching on null field values by passing a special string used to signify NULL.
""" """
null_value = 'NULL'
def filter(self, qs, value): def filter(self, qs, value):
if value != self.null_value: if value != settings.FILTERS_NULL_CHOICE_VALUE:
return super().filter(qs, value) return super().filter(qs, value)
qs = self.get_method(qs)(**{'{}__isnull'.format(self.name): True}) qs = self.get_method(qs)(**{'{}__isnull'.format(self.field_name): True})
return qs.distinct() if self.distinct else qs return qs.distinct() if self.distinct else qs