From 0f68ecda785a4512fbaee337dff18ba2218a3013 Mon Sep 17 00:00:00 2001 From: Daniel Sheppard Date: Thu, 28 Oct 2021 11:47:54 -0500 Subject: [PATCH] #6732 - Fix hiding of ASN field in Site creation form --- netbox/dcim/forms/models.py | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/netbox/dcim/forms/models.py b/netbox/dcim/forms/models.py index 805788c04..ca7074e05 100644 --- a/netbox/dcim/forms/models.py +++ b/netbox/dcim/forms/models.py @@ -166,13 +166,15 @@ class SiteForm(BootstrapMixin, TenancyForm, CustomFieldModelForm): def __init__(self, instance, *args, **kwargs): super(SiteForm, self).__init__(instance=instance, *args, **kwargs) if instance is None or (instance and (instance.asn is None or instance.asn == '')): - site_fieldset = list(self.Meta.fieldsets[0][1]) - site_fieldset.pop(6) - self.Meta.fieldsets = ( - ('Site', tuple(site_fieldset)), - self.Meta.fieldsets[1], - self.Meta.fieldsets[2], - ) + if 'asn' in self.Meta.fieldsets[0][1]: + site_fieldset = list(self.Meta.fieldsets[0][1]) + index = site_fieldset.index('asn') + site_fieldset.pop(index) + self.Meta.fieldsets = ( + ('Site', tuple(site_fieldset)), + self.Meta.fieldsets[1], + self.Meta.fieldsets[2], + ) del self.fields['asn']