From 7787eac08ed15532ff75bef7363c64c9e2f82a1f Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 27 Aug 2025 16:07:43 -0400
Subject: [PATCH] Fixes #20154: Restore missing changelog_message field on
 several forms

---
 netbox/templates/dcim/device_edit.html     |  5 +++++
 netbox/templates/dcim/htmx/cable_edit.html | 15 +++++++++------
 netbox/templates/ipam/vlan_edit.html       |  5 +++++
 3 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index 8ae98c201..7b010cb63 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -117,4 +117,9 @@
       {% render_field form.comments %}
     </div>
 
+    {# Meta fields #}
+    <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+      {% render_field form.changelog_message %}
+    </div>
+
 {% endblock %}
diff --git a/netbox/templates/dcim/htmx/cable_edit.html b/netbox/templates/dcim/htmx/cable_edit.html
index 46a6c4e58..63e32f570 100644
--- a/netbox/templates/dcim/htmx/cable_edit.html
+++ b/netbox/templates/dcim/htmx/cable_edit.html
@@ -87,9 +87,12 @@
   </div>
 {% endif %}
 
-{% if form.comments %}
-  <div class="field-group mb-5">
-    <h2 class="text-center">{% trans "Comments" %}</h2>
-    {% render_field form.comments %}
-  </div>
-{% endif %}
+<div class="field-group mb-5">
+  <h2 class="text-center">{% trans "Comments" %}</h2>
+  {% render_field form.comments %}
+</div>
+
+{# Meta fields #}
+<div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+  {% render_field form.changelog_message %}
+</div>
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index 53f5e02c4..b6c21f972 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -77,4 +77,9 @@
   <div class="field-group my-5">
     {% render_field form.comments %}
   </div>
+
+  {# Meta fields #}
+  <div class="bg-primary-subtle border border-primary rounded-1 pt-3 px-3 mb-3">
+    {% render_field form.changelog_message %}
+  </div>
 {% endblock %}