From 858f8ea623e1c208bd3433babe1110931c66b218 Mon Sep 17 00:00:00 2001
From: jeremystretch <jstretch@ns1.com>
Date: Wed, 19 Oct 2022 08:22:56 -0400
Subject: [PATCH] Specify fieldsets for additional models

---
 netbox/ipam/forms/models.py    | 12 ++++++++++++
 netbox/tenancy/forms/models.py |  6 ++++++
 2 files changed, 18 insertions(+)

diff --git a/netbox/ipam/forms/models.py b/netbox/ipam/forms/models.py
index ca25c0ae8..f66b7efba 100644
--- a/netbox/ipam/forms/models.py
+++ b/netbox/ipam/forms/models.py
@@ -170,6 +170,12 @@ class ASNForm(TenancyForm, NetBoxModelForm):
 class RoleForm(NetBoxModelForm):
     slug = SlugField()
 
+    fieldsets = (
+        ('Role', (
+            'name', 'slug', 'weight', 'description', 'tags',
+        )),
+    )
+
     class Meta:
         model = Role
         fields = [
@@ -790,6 +796,12 @@ class ServiceTemplateForm(NetBoxModelForm):
         help_text="Comma-separated list of one or more port numbers. A range may be specified using a hyphen."
     )
 
+    fieldsets = (
+        ('Service Template', (
+            'name', 'protocol', 'ports', 'description', 'tags',
+        )),
+    )
+
     class Meta:
         model = ServiceTemplate
         fields = ('name', 'protocol', 'ports', 'description', 'tags')
diff --git a/netbox/tenancy/forms/models.py b/netbox/tenancy/forms/models.py
index 34ba6847a..80af04928 100644
--- a/netbox/tenancy/forms/models.py
+++ b/netbox/tenancy/forms/models.py
@@ -84,6 +84,12 @@ class ContactGroupForm(NetBoxModelForm):
 class ContactRoleForm(NetBoxModelForm):
     slug = SlugField()
 
+    fieldsets = (
+        ('Contact Role', (
+            'name', 'slug', 'description', 'tags',
+        )),
+    )
+
     class Meta:
         model = ContactRole
         fields = ('name', 'slug', 'description', 'tags')