NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-21 11:37:21 -06:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

Closes: #16837 - Fix type__empty filter in character-based filters (#17574)

Browse Source 
* Fix type__empty filter in character-based filters

* Add tests
This commit is contained in:
bctiemann 2024-09-24 10:02:49 -04:00 committed by GitHub
parent 9c9c4fbd6e
commit 116a423d8f
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/dcim/tests/test_filtersets.py
View File

@ -5247,6 +5247,10 @@ class CableTestCase(TestCase, ChangeLoggedFilterSetTests):
def test_type(self): def test_type(self):
params = {'type': [CableTypeChoices.TYPE_CAT3, CableTypeChoices.TYPE_CAT5E]} params = {'type': [CableTypeChoices.TYPE_CAT3, CableTypeChoices.TYPE_CAT5E]}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4) self.assertEqual(self.filterset(params, self.queryset).qs.count(), 4)
params = {'type__empty': 'true'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 8)
params = {'type__empty': 'false'}
self.assertEqual(self.filterset(params, self.queryset).qs.count(), 6)
def test_status(self): def test_status(self):
params = {'status': [LinkStatusChoices.STATUS_CONNECTED]} params = {'status': [LinkStatusChoices.STATUS_CONNECTED]}

7
netbox/netbox/filtersets.py
View File

@ -133,7 +133,7 @@ class BaseFilterSet(django_filters.FilterSet):
django_filters.ModelChoiceFilter, django_filters.ModelChoiceFilter,
django_filters.ModelMultipleChoiceFilter, django_filters.ModelMultipleChoiceFilter,
TagFilter TagFilter
)) or existing_filter.extra.get('choices'): )):
# These filter types support only negation # These filter types support only negation
return FILTER_NEGATION_LOOKUP_MAP return FILTER_NEGATION_LOOKUP_MAP
@ -172,6 +172,7 @@ class BaseFilterSet(django_filters.FilterSet):
# Create new filters for each lookup expression in the map # Create new filters for each lookup expression in the map
for lookup_name, lookup_expr in lookup_map.items(): for lookup_name, lookup_expr in lookup_map.items():
new_filter_name = f'{existing_filter_name}__{lookup_name}' new_filter_name = f'{existing_filter_name}__{lookup_name}'
existing_filter_extra = deepcopy(existing_filter.extra)
try: try:
if existing_filter_name in cls.declared_filters: if existing_filter_name in cls.declared_filters:
@ -179,6 +180,8 @@ class BaseFilterSet(django_filters.FilterSet):
# create the new filter with the same type because there is no guarantee the defined type # create the new filter with the same type because there is no guarantee the defined type
# is the same as the default type for the field # is the same as the default type for the field
resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid resolve_field(field, lookup_expr) # Will raise FieldLookupError if the lookup is invalid
for field_to_remove in ('choices', 'null_value'):
existing_filter_extra.pop(field_to_remove, None)
filter_cls = django_filters.BooleanFilter if lookup_expr == 'empty' else type(existing_filter) filter_cls = django_filters.BooleanFilter if lookup_expr == 'empty' else type(existing_filter)
new_filter = filter_cls( new_filter = filter_cls(
field_name=field_name, field_name=field_name,
@ -186,7 +189,7 @@ class BaseFilterSet(django_filters.FilterSet):
label=existing_filter.label, label=existing_filter.label,
exclude=existing_filter.exclude, exclude=existing_filter.exclude,
distinct=existing_filter.distinct, distinct=existing_filter.distinct,
**existing_filter.extra **existing_filter_extra
) )
elif hasattr(existing_filter, 'custom_field'): elif hasattr(existing_filter, 'custom_field'):
# Filter is for a custom field # Filter is for a custom field