Bläddra i källkod

Fixes #21531: Fix search functionality for location when combined with other filters (#21599)

Jeremy Stretch 1 dag sedan
förälder
incheckning
67defb3228
1 ändrade filer med 2 tillägg och 5 borttagningar
  1. 2 5
      netbox/dcim/filtersets.py

+ 2 - 5
netbox/dcim/filtersets.py

@@ -306,12 +306,9 @@ class LocationFilterSet(TenancyFilterSet, ContactModelFilterSet, NestedGroupMode
         fields = ('id', 'name', 'slug', 'facility', 'description')
 
     def search(self, queryset, name, value):
-        # extended in order to include querying on Location.facility
-        queryset = super().search(queryset, name, value)
-
+        # Extend `search()` to include querying on Location.facility
         if value.strip():
-            queryset = queryset | queryset.model.objects.filter(facility__icontains=value)
-
+            return super().search(queryset, name, value) | queryset.filter(facility__icontains=value)
         return queryset