mirror/netbox-community-netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2024-05-10 07:54:54 +00:00
Code Activity

Fixes #9094 - Fix partial address search within Prefix and Aggregate filters

Browse Source
This commit is contained in:
Daniel Sheppard
2022-05-13 09:08:00 -05:00
parent 3c7c8c8776
commit 1d4409c703
2 changed files with 7 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
docs/release-notes/version-3.2.md
View File

@ -2,6 +2,11 @@
## v3.2.4 (FUTURE) ## v3.2.4 (FUTURE)
### Bug Fixes
* [#9094](https://github.com/netbox-community/netbox/issues/9094) - Fix partial address search within Prefix and Aggregate filters
--- ---
## v3.2.3 (2022-05-12) ## v3.2.3 (2022-05-12)

2
netbox/ipam/filtersets.py
View File

@ -148,6 +148,7 @@ class AggregateFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
try: try:
prefix = str(netaddr.IPNetwork(value.strip()).cidr) prefix = str(netaddr.IPNetwork(value.strip()).cidr)
qs_filter |= Q(prefix__net_contains_or_equals=prefix) qs_filter |= Q(prefix__net_contains_or_equals=prefix)
qs_filter |= Q(prefix__contains=value.strip())
except (AddrFormatError, ValueError): except (AddrFormatError, ValueError):
pass pass
return queryset.filter(qs_filter) return queryset.filter(qs_filter)
@ -337,6 +338,7 @@ class PrefixFilterSet(NetBoxModelFilterSet, TenancyFilterSet):
try: try:
prefix = str(netaddr.IPNetwork(value.strip()).cidr) prefix = str(netaddr.IPNetwork(value.strip()).cidr)
qs_filter |= Q(prefix__net_contains_or_equals=prefix) qs_filter |= Q(prefix__net_contains_or_equals=prefix)
qs_filter |= Q(prefix__contains=value.strip())
except (AddrFormatError, ValueError): except (AddrFormatError, ValueError):
pass pass
return queryset.filter(qs_filter) return queryset.filter(qs_filter)