Replace custom form templates with TabbedFieldGroups

netbox/circuits/forms/model_forms.py

@@ -7,6 +7,7 @@ from ipam.models import ASN
 from netbox.forms import NetBoxModelForm
 from tenancy.forms import TenancyForm
 from utilities.forms.fields import CommentField, DynamicModelChoiceField, DynamicModelMultipleChoiceField, SlugField
+from utilities.forms.rendering import TabbedFieldGroups
 from utilities.forms.widgets import DatePicker, NumberWithOptions
 
 __all__ = (
@@ -146,6 +147,21 @@ class CircuitTerminationForm(NetBoxModelForm):
         selector=True
     )
 
+    fieldsets = (
+        (_('Circuit Termination'), (
+            'circuit',
+            'term_side',
+            'description',
+            'tags',
+            TabbedFieldGroups(
+                (_('Site'), 'site'),
+                (_('Provider Network'), 'provider_network'),
+            ),
+            'mark_connected',
+        )),
+        (_('Termination Details'), ('port_speed', 'upstream_speed', 'xconnect_id', 'pp_info')),
+    )
+
     class Meta:
         model = CircuitTermination
         fields = [

netbox/circuits/views.py

@@ -412,7 +412,6 @@ class CircuitContactsView(ObjectContactsView):
 class CircuitTerminationEditView(generic.ObjectEditView):
     queryset = CircuitTermination.objects.all()
     form = forms.CircuitTerminationForm
-    template_name = 'circuits/circuittermination_edit.html'
 
 
 @register_model_view(CircuitTermination, 'delete')