From a5d617337258675ca9f2ae6152028fa6051d182f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Thu, 24 Jul 2025 16:24:06 -0400
Subject: [PATCH] Fix changelog message support for VirtualChassis

---
 netbox/dcim/forms/object_create.py            |  5 +++
 netbox/dcim/views.py                          |  2 +-
 netbox/templates/dcim/virtualchassis_add.html | 40 -------------------
 .../templates/dcim/virtualchassis_edit.html   |  3 ++
 4 files changed, 9 insertions(+), 41 deletions(-)
 delete mode 100644 netbox/templates/dcim/virtualchassis_add.html

diff --git a/netbox/dcim/forms/object_create.py b/netbox/dcim/forms/object_create.py
index bcf91c547..5c9599eeb 100644
--- a/netbox/dcim/forms/object_create.py
+++ b/netbox/dcim/forms/object_create.py
@@ -426,6 +426,11 @@ class VirtualChassisCreateForm(NetBoxModelForm):
         help_text=_('Position of the first member device. Increases by one for each additional member.')
     )
 
+    fieldsets = (
+        FieldSet('name', 'domain', 'description', 'tags', name=_('Virtual Chassis')),
+        FieldSet('region', 'site_group', 'site', 'rack', 'members', 'initial_position', name=_('Member Devices')),
+    )
+
     class Meta:
         model = VirtualChassis
         fields = [
diff --git a/netbox/dcim/views.py b/netbox/dcim/views.py
index 94afc2cb2..277a634ce 100644
--- a/netbox/dcim/views.py
+++ b/netbox/dcim/views.py
@@ -3702,7 +3702,6 @@ class VirtualChassisView(generic.ObjectView):
 class VirtualChassisCreateView(generic.ObjectEditView):
     queryset = VirtualChassis.objects.all()
     form = forms.VirtualChassisCreateForm
-    template_name = 'dcim/virtualchassis_add.html'
 
 
 @register_model_view(VirtualChassis, 'edit')
@@ -3750,6 +3749,7 @@ class VirtualChassisEditView(ObjectPermissionRequiredMixin, GetReturnURLMixin, V
         formset = VCMemberFormSet(request.POST, queryset=members_queryset)
 
         if vc_form.is_valid() and formset.is_valid():
+            virtual_chassis._changelog_message = vc_form.cleaned_data.pop('changelog_message', '')
 
             with transaction.atomic(using=router.db_for_write(Device)):
 
diff --git a/netbox/templates/dcim/virtualchassis_add.html b/netbox/templates/dcim/virtualchassis_add.html
deleted file mode 100644
index 832671a61..000000000
--- a/netbox/templates/dcim/virtualchassis_add.html
+++ /dev/null
@@ -1,40 +0,0 @@
-{% extends 'generic/object_edit.html' %}
-{% load form_helpers %}
-{% load i18n %}
-
-{% block form %}
-  {% for field in form.hidden_fields %}
-    {{ field }}
-  {% endfor %}
-
-  <div class="field-group my-5">
-    <div class="row">
-      <h2 class="col-9 offset-3">{% trans "Virtual Chassis" %}</h2>
-    </div>
-    {% render_field form.name %}
-    {% render_field form.domain %}
-    {% render_field form.description %}
-    {% render_field form.tags %}
-  </div>
-
-  <div class="field-group my-5">
-    <div class="row">
-      <h2 class="col-9 offset-3">{% trans "Member Devices" %}</h2>
-    </div>
-    {% render_field form.region %}
-    {% render_field form.site_group %}
-    {% render_field form.site %}
-    {% render_field form.rack %}
-    {% render_field form.members %}
-    {% render_field form.initial_position %}
-  </div>
-
-  {% if form.custom_fields %}
-    <div class="field-group my-5">
-      <div class="row">
-        <h2 class="col-9 offset-3">{% trans "Custom Fields" %}</h2>
-      </div>
-      {% render_custom_fields form %}
-    </div>
-  {% endif %}
-{% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 29f5cac53..768fb7666 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -102,6 +102,9 @@
                 {% endfor %}
             </tbody>
         </table>
+        <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+          {% render_field vc_form.changelog_message %}
+        </div>
       </div>
       <div class="text-end">
           <a href="{{ return_url }}" class="btn btn-outline-secondary">{% trans "Cancel" %}</a>