starred/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2026-04-27 03:09:31 +02:00
Code Issues 273 Packages Projects Releases 10 Wiki Activity

Merge branch 'main' into feature

Browse Source
This commit is contained in:
Jeremy Stretch
2026-01-06 13:05:07 -05:00
parent bad688b8aa fa8a9ef9de
commit 6f2ba5c75c
89 changed files with 29641 additions and 6670 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
netbox/ipam/forms/bulk_import.py
View File

@@ -229,10 +229,6 @@ class PrefixImportForm(ScopedImportForm, PrimaryModelImportForm):
query |= Q(**{
f"site__{self.fields['vlan_site'].to_field_name}": vlan_site
})
# Don't Forget to include VLANs without a site in the filter
query |= Q(**{
f"site__{self.fields['vlan_site'].to_field_name}__isnull": True
})
if vlan_group:
query &= Q(**{