Merge pull request #121 from netboxlabs/35-group-name

35 fix group name on edit form

Author: bctiemann

netbox_custom_objects/templates/netbox_custom_objects/customobject_edit.html

@@ -1,4 +1,5 @@
 {% extends 'generic/object_edit.html' %}
+{% load form_helpers %}
 {% load i18n %}
 
 {% block title %}
@@ -9,4 +10,25 @@
       Add a new {{ custom_object_type }}
     {% endblocktrans %}
   {% endif %}
-{% endblock title %}
+{% endblock title %}
+
+{% block form %}
+  {# Render hidden fields #}
+  {% for field in form.hidden_fields %}
+    {{ field }}
+  {% endfor %}
+
+  {# Render all fields grouped by group_name #}
+  <div class="field-group mb-5">
+    {% for group, fields in form.custom_field_groups.items %}
+      {% if group %}
+      <div class="row">
+        <h3 class="col-9 offset-3 mb-3 h4">{{ group }}</h3>
+      </div>
+      {% endif %}
+      {% for name in fields %}
+        {% render_field form|getfield:name %}
+      {% endfor %}
+    {% endfor %}
+  </div>
+{% endblock form %}

netbox_custom_objects/views.py

@@ -368,22 +368,44 @@ def get_form(self, model):
             "Meta": meta,
             "__module__": "database.forms",
             "_errors": None,
+            "custom_fields": {},
+            "custom_field_groups": {},
         }
 
-        for field in self.object.custom_object_type.fields.all():
+        for field in self.object.custom_object_type.fields.all().order_by('group_name', 'weight', 'name'):
             field_type = field_types.FIELD_TYPE_CLASS[field.type]()
             try:
-                attrs[field.name] = field_type.get_annotated_form_field(field)
+                field_name = field.name
+                attrs[field_name] = field_type.get_annotated_form_field(field)
+
+                # Annotate the field in the list of CustomField form fields
+                attrs["custom_fields"][field_name] = field
+
+                # Group fields by group_name (similar to NetBox custom fields)
+                group_name = field.group_name or None  # Use None for ungrouped fields
+                if group_name not in attrs["custom_field_groups"]:
+                    attrs["custom_field_groups"][group_name] = []
+                attrs["custom_field_groups"][group_name].append(field_name)
+
             except NotImplementedError:
                 print(f"get_form: {field.name} field is not supported")
 
-        form = type(
+        # Create a custom __init__ method to set instance attributes
+        def custom_init(self, *args, **kwargs):
+            super(form_class, self).__init__(*args, **kwargs)
+            # Set the grouping info as instance attributes from the outer scope
+            self.custom_fields = attrs["custom_fields"]
+            self.custom_field_groups = attrs["custom_field_groups"]
+
+        attrs["__init__"] = custom_init
+
+        form_class = type(
             f"{model._meta.object_name}Form",
             (forms.NetBoxModelForm,),
             attrs,
         )
 
-        return form
+        return form_class
 
 
 @register_model_view(CustomObject, "delete")