feat(form): ACLExtendedRule: Instruct new Sources to be displayed as Tabbed Group; Improve Fieldsets

Author: rvveber

netbox_acls/forms/models.py

@@ -617,18 +617,29 @@ class ACLExtendedRuleForm(NetBoxModelForm):
         label="Destination Prefix",
     )
     fieldsets = (
-        ("Access List Details", ("access_list", "description", "tags")),
-        (
-            "Rule Definition",
-            (
-                "index",
-                "action",
-                "remark",
-                "source_prefix",
-                "source_ports",
-                "destination_prefix",
-                "destination_ports",
-                "protocol",
+        FieldSet(
+            "access_list", 
+            "description", 
+            "tags",
+            name=_('Access List Details')
+        ),
+        FieldSet(
+            "index", 
+            "action", 
+            "remark", 
+            "protocol",
+            name=_('Rule Definition')
+        ),
+        FieldSet(
+            TabbedGroups(
+                FieldSet('source_prefix', name=_('Prefix')),
+                FieldSet('source_iprange', name=_('IP Range')),
+                FieldSet('source_ipaddress', name=_('IP Address')),
+                FieldSet('source_aggregate', name=_('Aggregate')),
+                FieldSet('source_service', name=_('Service')),
+            ),
+            "source_ports",
+        ),
             ),
         ),
     )