From e93255e00c93bc0281e331fa3ce59f74783ba95e Mon Sep 17 00:00:00 2001 From: Pieter Lambrecht Date: Tue, 13 Aug 2024 14:58:37 +0200 Subject: [PATCH 1/2] add 'vlan' to prefix bulk edit --- netbox/ipam/forms/bulk_edit.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index c7f64ab1d87..e1cfcf9350e 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -221,6 +221,19 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): 'group_id': '$site_group', } ) + vlan_group = DynamicModelChoiceField( + queryset=VLANGroup.objects.all(), + required=False, + label=_('VLAN Group') + ) + vlan = DynamicModelChoiceField( + queryset=VLAN.objects.all(), + required=False, + label=_('VLAN'), + query_params={ + 'group_id': '$vlan_group', + } + ) vrf = DynamicModelChoiceField( queryset=VRF.objects.all(), required=False, @@ -268,10 +281,10 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( FieldSet('tenant', 'status', 'role', 'description'), FieldSet('region', 'site_group', 'site', name=_('Site')), - FieldSet('vrf', 'prefix_length', 'is_pool', 'mark_utilized', name=_('Addressing')), + FieldSet('vlan_group', 'vlan', 'vrf', 'prefix_length', 'is_pool', 'mark_utilized', name=_('Addressing')), ) nullable_fields = ( - 'site', 'vrf', 'tenant', 'role', 'description', 'comments', + 'site', 'vlan', 'vrf', 'tenant', 'role', 'description', 'comments', ) From b734694e229e006a42dbb54de0f6e5184770931c Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Tue, 13 Aug 2024 09:38:08 -0400 Subject: [PATCH 2/2] Move VLAN fields to a separate field set in bulk edit form --- netbox/ipam/forms/bulk_edit.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/netbox/ipam/forms/bulk_edit.py b/netbox/ipam/forms/bulk_edit.py index e1cfcf9350e..5f3353ea1ff 100644 --- a/netbox/ipam/forms/bulk_edit.py +++ b/netbox/ipam/forms/bulk_edit.py @@ -281,7 +281,8 @@ class PrefixBulkEditForm(NetBoxModelBulkEditForm): fieldsets = ( FieldSet('tenant', 'status', 'role', 'description'), FieldSet('region', 'site_group', 'site', name=_('Site')), - FieldSet('vlan_group', 'vlan', 'vrf', 'prefix_length', 'is_pool', 'mark_utilized', name=_('Addressing')), + FieldSet('vrf', 'prefix_length', 'is_pool', 'mark_utilized', name=_('Addressing')), + FieldSet('vlan_group', 'vlan', name=_('VLAN Assignment')), ) nullable_fields = ( 'site', 'vlan', 'vrf', 'tenant', 'role', 'description', 'comments',