From 862e44e96ffb7de9dca2d4183218fb956a1f7787 Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Thu, 7 Jun 2018 14:51:27 -0400 Subject: [PATCH] Fixes #2148: Do not force timezone selection when editing sites in bulk --- netbox/dcim/forms.py | 38 +++++++++++++++++++++++++++++++------- 1 file changed, 31 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py index 05dc0ea6f..da8dc0457 100644 --- a/netbox/dcim/forms.py +++ b/netbox/dcim/forms.py @@ -166,13 +166,37 @@ class SiteCSVForm(forms.ModelForm): class SiteBulkEditForm(BootstrapMixin, CustomFieldBulkEditForm): - pk = forms.ModelMultipleChoiceField(queryset=Site.objects.all(), widget=forms.MultipleHiddenInput) - status = forms.ChoiceField(choices=add_blank_choice(SITE_STATUS_CHOICES), required=False, initial='') - region = TreeNodeChoiceField(queryset=Region.objects.all(), required=False) - tenant = forms.ModelChoiceField(queryset=Tenant.objects.all(), required=False) - asn = forms.IntegerField(min_value=1, max_value=4294967295, required=False, label='ASN') - description = forms.CharField(max_length=100, required=False) - time_zone = TimeZoneFormField(required=False) + pk = forms.ModelMultipleChoiceField( + queryset=Site.objects.all(), + widget=forms.MultipleHiddenInput + ) + status = forms.ChoiceField( + choices=add_blank_choice(SITE_STATUS_CHOICES), + required=False, + initial='' + ) + region = TreeNodeChoiceField( + queryset=Region.objects.all(), + required=False + ) + tenant = forms.ModelChoiceField( + queryset=Tenant.objects.all(), + required=False + ) + asn = forms.IntegerField( + min_value=1, + max_value=4294967295, + required=False, + label='ASN' + ) + description = forms.CharField( + max_length=100, + required=False + ) + time_zone = TimeZoneFormField( + choices=add_blank_choice(TimeZoneFormField().choices), + required=False + ) class Meta: nullable_fields = ['region', 'tenant', 'asn', 'description', 'time_zone']