From 3cb351dceb1a34dbee125a33431c6effea5971aa Mon Sep 17 00:00:00 2001 From: John Anderson Date: Wed, 28 Feb 2018 16:31:53 -0500 Subject: [PATCH] fixed form bound check for site and vlan group --- netbox/dcim/forms.py | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 6d0892f67..da6ee428f 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -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 = {