From 51568d48be7525b7567342dad0285cd88299aa5b Mon Sep 17 00:00:00 2001 From: Renato Almeida de Oliveira Zaroubin Date: Mon, 10 Mar 2025 22:46:40 +0000 Subject: [PATCH] Change site field to vlan_site --- netbox/ipam/forms/bulk_import.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/netbox/ipam/forms/bulk_import.py b/netbox/ipam/forms/bulk_import.py index ef67127e7..a672fd641 100644 --- a/netbox/ipam/forms/bulk_import.py +++ b/netbox/ipam/forms/bulk_import.py @@ -177,7 +177,7 @@ class PrefixImportForm(ScopedImportForm, NetBoxModelImportForm): to_field_name='name', help_text=_("VLAN's group (if any)") ) - site = CSVModelChoiceField( + vlan_site = CSVModelChoiceField( label=_('VLAN Site'), queryset=Site.objects.all(), required=False, @@ -207,7 +207,7 @@ class PrefixImportForm(ScopedImportForm, NetBoxModelImportForm): class Meta: model = Prefix fields = ( - 'prefix', 'vrf', 'tenant', 'vlan_group', 'site', 'vlan', 'status', 'role', 'scope_type', 'scope_id', + 'prefix', 'vrf', 'tenant', 'vlan_group', 'vlan_site', 'vlan', 'status', 'role', 'scope_type', 'scope_id', 'is_pool', 'mark_utilized', 'description', 'comments', 'tags', ) labels = { @@ -220,19 +220,19 @@ class PrefixImportForm(ScopedImportForm, NetBoxModelImportForm): if not data: return - site = data.get('site') + vlan_site = data.get('vlan_site') vlan_group = data.get('vlan_group') # Limit VLAN queryset by assigned site and/or group (if specified) query = Q() - if site: + if vlan_site: query |= Q(**{ - f"site__{self.fields['site'].to_field_name}": site + f"site__{self.fields['vlan_site'].to_field_name}": vlan_site }) # Don't Forget to include VLANs without a site in the filter query |= Q(**{ - f"site__{self.fields['site'].to_field_name}__isnull": True + f"site__{self.fields['vlan_site'].to_field_name}__isnull": True }) if vlan_group: