NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-17 12:42:52 -06:00
Code Issues Actions 7 Packages Projects Releases Wiki Activity

Fixes #6006: Fix VLAN group/site association for bulk prefix import

Browse Source
This commit is contained in:
Jeremy Stretch 2021-03-19 10:22:30 -04:00
parent 91fe80f73c
commit e4ecd2dae9
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/release-notes/version-2.10.md
View File

@ -9,6 +9,7 @@
* [#5962](https://github.com/netbox-community/netbox/issues/5962) - Ensure consistent display of change log action labels * [#5962](https://github.com/netbox-community/netbox/issues/5962) - Ensure consistent display of change log action labels
* [#5966](https://github.com/netbox-community/netbox/issues/5966) - Skip Markdown reference link when tabbing through form fields * [#5966](https://github.com/netbox-community/netbox/issues/5966) - Skip Markdown reference link when tabbing through form fields
* [#5977](https://github.com/netbox-community/netbox/issues/5977) - Correct validation of `RELEASE_CHECK_URL` config parameter * [#5977](https://github.com/netbox-community/netbox/issues/5977) - Correct validation of `RELEASE_CHECK_URL` config parameter
* [#6006](https://github.com/netbox-community/netbox/issues/6006) - Fix VLAN group/site association for bulk prefix import
--- ---

14
netbox/ipam/forms.py
View File

@ -465,12 +465,14 @@ class PrefixCSVForm(CustomFieldModelCSVForm):
if data: if data:
# Limit vlan queryset by assigned site and group # Limit VLAN queryset by assigned site and/or group (if specified)
params = { params = {}
f"site__{self.fields['site'].to_field_name}": data.get('site'), if data.get('site'):
f"group__{self.fields['vlan_group'].to_field_name}": data.get('vlan_group'), params[f"site__{self.fields['site'].to_field_name}"] = data.get('site')
} if data.get('vlan_group'):
self.fields['vlan'].queryset = self.fields['vlan'].queryset.filter(**params) params[f"group__{self.fields['vlan_group'].to_field_name}"] = data.get('vlan_group')
if params:
self.fields['vlan'].queryset = self.fields['vlan'].queryset.filter(**params)
class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm): class PrefixBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditForm):