From 67defb322830ca4cc2e03d4986cd2c1e7d4f8e77 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 6 Mar 2026 12:54:10 -0500 Subject: [PATCH] Fixes #21531: Fix search functionality for location when combined with other filters (#21599) --- netbox/dcim/filtersets.py | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/netbox/dcim/filtersets.py b/netbox/dcim/filtersets.py index b92ec52b4..927ef9f45 100644 --- a/netbox/dcim/filtersets.py +++ b/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