NeoAnd/netbox
1
0
Fork 0
mirror of https://github.com/netbox-community/netbox.git synced 2025-07-24 09:28:38 -06:00
Code Issues Actions 9 Packages Projects Releases Wiki Activity

Merge pull request #1929 from lampwins/bug/1928

Browse Source 
Fixed #1928 form bound check for site and vlan group
This commit is contained in:
Jeremy Stretch 2018-03-01 12:22:17 -05:00 committed by GitHub
commit 0476006ef2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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

@ -1730,10 +1730,10 @@ class InterfaceForm(BootstrapMixin, forms.ModelForm, ChainedFieldsMixin):
self.fields['site'].initial = None self.fields['site'].initial = None
# Limit the initial vlan choices # 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 = { filter_dict = {
'group_id': self.data.get('vlan_group') or None, 'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site') or None, 'site_id': self.data.get('site'),
} }
elif self.initial.get('untagged_vlan'): elif self.initial.get('untagged_vlan'):
filter_dict = { filter_dict = {
@ -1856,10 +1856,10 @@ class InterfaceCreateForm(ComponentForm, ChainedFieldsMixin):
self.fields['site'].initial = None self.fields['site'].initial = None
# Limit the initial vlan choices # 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 = { filter_dict = {
'group_id': self.data.get('vlan_group') or None, 'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site') or None, 'site_id': self.data.get('site'),
} }
elif self.initial.get('untagged_vlan'): elif self.initial.get('untagged_vlan'):
filter_dict = { filter_dict = {
@ -1970,10 +1970,10 @@ class InterfaceBulkEditForm(BootstrapMixin, BulkEditForm, ChainedFieldsMixin):
self.fields['site'].queryset = Site.objects.none() self.fields['site'].queryset = Site.objects.none()
self.fields['site'].initial = 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 = { filter_dict = {
'group_id': self.data.get('vlan_group') or None, 'group_id': self.data.get('vlan_group'),
'site_id': self.data.get('site') or None, 'site_id': self.data.get('site'),
} }
else: else:
filter_dict = { filter_dict = {