diff --git a/netbox/ipam/forms.py b/netbox/ipam/forms.py index 538984b6e..09de5b552 100644 --- a/netbox/ipam/forms.py +++ b/netbox/ipam/forms.py @@ -240,10 +240,12 @@ def prefix_site_choices(): site_choices = Site.objects.annotate(prefix_count=Count('prefixes')) return [(s.slug, '{} ({})'.format(s.name, s.prefix_count)) for s in site_choices] + def prefix_vlan_choices(): vlan_choices = VLAN.objects.annotate(prefix_count=Count('prefixes')) return [(v.id, '{} ({})'.format(v.display_name, v.prefix_count)) for v in vlan_choices] + def prefix_status_choices(): status_counts = {} for status in Prefix.objects.values('status').annotate(count=Count('status')).order_by('status'): @@ -262,8 +264,8 @@ class PrefixFilterForm(forms.Form, BootstrapMixin): status = forms.MultipleChoiceField(required=False, choices=prefix_status_choices) site = forms.MultipleChoiceField(required=False, choices=prefix_site_choices, widget=forms.SelectMultiple(attrs={'size': 6})) - vlan_id = forms.MultipleChoiceField(required=False, choices=prefix_vlan_choices, label='VLAN', - widget=forms.SelectMultiple(attrs={'size': 8})) + vlan_id = forms.MultipleChoiceField(required=False, choices=prefix_vlan_choices, + label='VLAN', widget=forms.SelectMultiple(attrs={'size': 8})) role = forms.MultipleChoiceField(required=False, choices=prefix_role_choices, widget=forms.SelectMultiple(attrs={'size': 6})) expand = forms.BooleanField(required=False, label='Expand prefix hierarchy') diff --git a/netbox/utilities/forms.py b/netbox/utilities/forms.py index 190745b7c..fd184904a 100644 --- a/netbox/utilities/forms.py +++ b/netbox/utilities/forms.py @@ -247,10 +247,10 @@ class BulkImportForm(forms.Form): for i, record in enumerate(records, start=1): obj_form = self.fields['csv'].csv_form(data=record) try: - if obj_form.is_valid(): + if obj_form.is_valid(): obj = obj_form.save(commit=False) obj_list.append(obj) - else: + else: for field, errors in obj_form.errors.items(): for e in errors: if field == '__all__':