From 1f4bd88401b7cf3f7348e7ac356653f58e6d907d Mon Sep 17 00:00:00 2001 From: Jeremy Stretch Date: Wed, 13 Aug 2025 10:02:58 -0400 Subject: [PATCH] #19713: Fix duplicate changelog_message fields on bulk edit forms without fieldsets defined --- netbox/netbox/forms/mixins.py | 9 +++++++++ netbox/templates/generic/bulk_edit.html | 3 ++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/netbox/netbox/forms/mixins.py b/netbox/netbox/forms/mixins.py index 84928fcd9..4096ffb25 100644 --- a/netbox/netbox/forms/mixins.py +++ b/netbox/netbox/forms/mixins.py @@ -23,6 +23,15 @@ class ChangelogMessageMixin(forms.Form): max_length=200 ) + def __init__(self, *args, **kwargs): + super().__init__(*args, **kwargs) + + # Declare changelog_message a meta field + if hasattr(self, 'meta_fields'): + self.meta_fields.append('changelog_message') + else: + self.meta_fields = ['changelog_message'] + class CustomFieldsMixin: """ diff --git a/netbox/templates/generic/bulk_edit.html b/netbox/templates/generic/bulk_edit.html index 58bf6dbc2..ffb0d59a9 100644 --- a/netbox/templates/generic/bulk_edit.html +++ b/netbox/templates/generic/bulk_edit.html @@ -93,7 +93,8 @@ Context: {# Render all fields #} {% for field in form.visible_fields %} - {% if field.name in form.nullable_fields %} + {% if field.name in form.meta_fields %} + {% elif field.name in form.nullable_fields %} {% render_field field bulk_nullable=True %} {% else %} {% render_field field %}