Jelajahi Sumber

Fixes #11601 - Add partial lookup to IPRangeFilterSet

kkthxbye-code 3 tahun lalu
induk
melakukan
f9237285fd
1 mengubah file dengan 2 tambahan dan 2 penghapusan
  1. 2 2
      netbox/ipam/filtersets.py

+ 2 - 2
netbox/ipam/filtersets.py

@@ -441,9 +441,9 @@ class IPRangeFilterSet(TenancyFilterSet, NetBoxModelFilterSet):
     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 = Q(description__icontains=value)
+        qs_filter = Q(description__icontains=value) | Q(start_address__contains=value) | Q(end_address__contains=value)
         try:
         try:
-            ipaddress = str(netaddr.IPNetwork(value.strip()).cidr)
+            ipaddress = str(netaddr.IPNetwork(value.strip()))
             qs_filter |= Q(start_address=ipaddress)
             qs_filter |= Q(start_address=ipaddress)
             qs_filter |= Q(end_address=ipaddress)
             qs_filter |= Q(end_address=ipaddress)
         except (AddrFormatError, ValueError):
         except (AddrFormatError, ValueError):