From a09c1667ffb6072ea317e179010d034a402f0b5e Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Fri, 30 Aug 2024 08:40:16 -0400 Subject: [PATCH] #15106: Put distance & distance_unit on same line in model form --- netbox/wireless/forms/model_forms.py | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/netbox/wireless/forms/model_forms.py b/netbox/wireless/forms/model_forms.py index 6d46373ac..7c2594271 100644 --- a/netbox/wireless/forms/model_forms.py +++ b/netbox/wireless/forms/model_forms.py @@ -6,7 +6,7 @@ from ipam.models import VLAN from netbox.forms import NetBoxModelForm from tenancy.forms import TenancyForm from utilities.forms.fields import CommentField, DynamicModelChoiceField, SlugField -from utilities.forms.rendering import FieldSet +from utilities.forms.rendering import FieldSet, InlineFields from wireless.models import * __all__ = ( @@ -159,7 +159,14 @@ class WirelessLinkForm(TenancyForm, NetBoxModelForm): fieldsets = ( FieldSet('site_a', 'location_a', 'device_a', 'interface_a', name=_('Side A')), FieldSet('site_b', 'location_b', 'device_b', 'interface_b', name=_('Side B')), - FieldSet('status', 'ssid', 'distance', 'distance_unit', 'description', 'tags', name=_('Link')), + FieldSet( + 'status', + 'ssid', + InlineFields('distance', 'distance_unit', label=_('Distance')), + 'description', + 'tags', + name=_('Link') + ), FieldSet('tenant_group', 'tenant', name=_('Tenancy')), FieldSet('auth_type', 'auth_cipher', 'auth_psk', name=_('Authentication')), )