mirror of
https://github.com/netbox-community/netbox.git
synced 2026-04-22 16:58:49 +02:00
Fix filtering logic for VM filterset
This commit is contained in:
@@ -231,7 +231,7 @@ class VirtualMachineFilterSet(
|
|||||||
def search(self, queryset, name, value):
|
def search(self, queryset, name, value):
|
||||||
if not value.strip():
|
if not value.strip():
|
||||||
return queryset
|
return queryset
|
||||||
qs_filter = queryset.filter(
|
qs_filter = Q(
|
||||||
Q(name__icontains=value) |
|
Q(name__icontains=value) |
|
||||||
Q(description__icontains=value) |
|
Q(description__icontains=value) |
|
||||||
Q(comments__icontains=value) |
|
Q(comments__icontains=value) |
|
||||||
@@ -246,7 +246,7 @@ class VirtualMachineFilterSet(
|
|||||||
qs_filter |= Q(primary_ip6__address__host__inet=ipaddress.ip)
|
qs_filter |= Q(primary_ip6__address__host__inet=ipaddress.ip)
|
||||||
except (AddrFormatError, ValueError):
|
except (AddrFormatError, ValueError):
|
||||||
pass
|
pass
|
||||||
return qs_filter
|
return queryset.filter(qs_filter)
|
||||||
|
|
||||||
def _has_primary_ip(self, queryset, name, value):
|
def _has_primary_ip(self, queryset, name, value):
|
||||||
params = Q(primary_ip4__isnull=False) | Q(primary_ip6__isnull=False)
|
params = Q(primary_ip4__isnull=False) | Q(primary_ip6__isnull=False)
|
||||||
|
|||||||
Reference in New Issue
Block a user