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

fixed form bound check for site and vlan group

Browse Source
This commit is contained in:
John Anderson 2018-02-28 16:31:53 -05:00
parent 970759ed8b
commit 3cb351dceb
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
netbox/dcim/forms.py
View File

@ -1728,10 +1728,10 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm, ChainedFieldsMixin):
self.fields['site'].initial = None
# Limit the initial vlan choices
if self.is_bound:
if self.is_bound and self.data.get('vlan_group') and self.data.get('site'):
filter_dict = {
'group_id': self.data.get('vlan_group') or None,
'site_id': self.data.get('site') or None,
'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site'),
}
elif self.initial.get('untagged_vlan'):
filter_dict = {
@ -1854,10 +1854,10 @@ class InterfaceCreateForm(ComponentForm, ChainedFieldsMixin):
self.fields['site'].initial = None
# Limit the initial vlan choices
if self.is_bound:
if self.is_bound and self.data.get('vlan_group') and self.data.get('site'):
filter_dict = {
'group_id': self.data.get('vlan_group') or None,
'site_id': self.data.get('site') or None,
'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site'),
}
elif self.initial.get('untagged_vlan'):
filter_dict = {
@ -1968,10 +1968,10 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm, ChainedFieldsMixin):
self.fields['site'].queryset = Site.objects.none()
self.fields['site'].initial = None
if self.is_bound:
if self.is_bound and self.data.get('vlan_group') and self.data.get('site'):
filter_dict = {
'group_id': self.data.get('vlan_group') or None,
'site_id': self.data.get('site') or None,
'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site'),
}
else:
filter_dict = {