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

Fixes #3574 - Change device to parent in interface edit form vlan filtering logic

Browse Source
This commit is contained in:
dansheps 2019-10-07 08:54:39 -05:00
parent a3b9bdaff1
commit 04d9889127
3 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGELOG.md
View File

@ -1,5 +1,9 @@
v2.6.6 (FUTURE) v2.6.6 (FUTURE)
## Bug Fixes
* [#3574](https://github.com/netbox-community/netbox/issues/3574) - Change `device` to `parent` in interface editing vlan filtering logic
## Enhancements ## Enhancements
* [#3259](https://github.com/netbox-community/netbox/issues/3259) - Add `rack` and `site` filters for cables * [#3259](https://github.com/netbox-community/netbox/issues/3259) - Add `rack` and `site` filters for cables

2
netbox/dcim/forms.py
View File

@ -2215,7 +2215,7 @@ class InterfaceForm(InterfaceCommonForm, BootstrapMixin, forms.ModelForm):
(group.name, [(vlan.pk, vlan) for vlan in global_group_vlans]) (group.name, [(vlan.pk, vlan) for vlan in global_group_vlans])
) )
site = getattr(self.instance.device, 'site', None) site = getattr(self.instance.parent, 'site', None)
if site is not None: if site is not None:
# Add non-grouped site VLANs # Add non-grouped site VLANs

2
netbox/virtualization/forms.py
View File

@ -670,7 +670,7 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm):
(group.name, [(vlan.pk, vlan) for vlan in global_group_vlans]) (group.name, [(vlan.pk, vlan) for vlan in global_group_vlans])
) )
site = getattr(self.instance.device, 'site', None) site = getattr(self.instance.parent, 'site', None)
if site is not None: if site is not None:
# Add non-grouped site VLANs # Add non-grouped site VLANs