diff --git a/docs/release-notes/version-3.4.md b/docs/release-notes/version-3.4.md
index d682c9fca..b913a252a 100644
--- a/docs/release-notes/version-3.4.md
+++ b/docs/release-notes/version-3.4.md
@@ -14,6 +14,7 @@
* [#12084](https://github.com/netbox-community/netbox/issues/12084) - Fix exception when attempting to create a saved filter for applied filters
* [#12087](https://github.com/netbox-community/netbox/issues/12087) - Fix bulk editing of many-to-many relationships
* [#12117](https://github.com/netbox-community/netbox/issues/12117) - Hide clone button for objects with no clonable attributes
+* [#12190](https://github.com/netbox-community/netbox/issues/12190) - Fix form layout for plugin textarea fields
---
diff --git a/netbox/templates/dcim/cable_edit.html b/netbox/templates/dcim/cable_edit.html
index 1c747b44b..0ad0637e3 100644
--- a/netbox/templates/dcim/cable_edit.html
+++ b/netbox/templates/dcim/cable_edit.html
@@ -98,7 +98,7 @@
- {% render_field form.comments %}
+ {% render_field form.comments %}
{% if form.custom_fields %}
diff --git a/netbox/templates/dcim/device_edit.html b/netbox/templates/dcim/device_edit.html
index b814e65ef..185482162 100644
--- a/netbox/templates/dcim/device_edit.html
+++ b/netbox/templates/dcim/device_edit.html
@@ -111,7 +111,6 @@
-
Comments
{% render_field form.comments %}
diff --git a/netbox/templates/dcim/rack_edit.html b/netbox/templates/dcim/rack_edit.html
index cd9ed637a..03624df1f 100644
--- a/netbox/templates/dcim/rack_edit.html
+++ b/netbox/templates/dcim/rack_edit.html
@@ -85,7 +85,6 @@
{% endif %}
-
Comments
{% render_field form.comments %}
{% endblock %}
diff --git a/netbox/templates/dcim/virtualchassis_edit.html b/netbox/templates/dcim/virtualchassis_edit.html
index 433837cf5..82b4c5bcc 100644
--- a/netbox/templates/dcim/virtualchassis_edit.html
+++ b/netbox/templates/dcim/virtualchassis_edit.html
@@ -27,7 +27,6 @@
-
Comments
{% render_field vc_form.comments %}
diff --git a/netbox/templates/generic/object_edit.html b/netbox/templates/generic/object_edit.html
index c61fb723f..ff2ca26ad 100644
--- a/netbox/templates/generic/object_edit.html
+++ b/netbox/templates/generic/object_edit.html
@@ -85,7 +85,6 @@ Context:
{% if form.comments %}
-
Comments
{% render_field form.comments %}
{% endif %}
diff --git a/netbox/templates/ipam/fhrpgroup_edit.html b/netbox/templates/ipam/fhrpgroup_edit.html
index bf86e6c41..bc0a6797c 100644
--- a/netbox/templates/ipam/fhrpgroup_edit.html
+++ b/netbox/templates/ipam/fhrpgroup_edit.html
@@ -33,9 +33,6 @@
{% endif %}
-
-
Comments
-
{% render_field form.comments %}
diff --git a/netbox/templates/ipam/ipaddress_edit.html b/netbox/templates/ipam/ipaddress_edit.html
index b9a988009..4aa1c610a 100644
--- a/netbox/templates/ipam/ipaddress_edit.html
+++ b/netbox/templates/ipam/ipaddress_edit.html
@@ -139,9 +139,6 @@
-
-
Comments
-
{% render_field form.comments %}
diff --git a/netbox/templates/ipam/service_create.html b/netbox/templates/ipam/service_create.html
index 5c47dd2f8..2d8d183c5 100644
--- a/netbox/templates/ipam/service_create.html
+++ b/netbox/templates/ipam/service_create.html
@@ -66,9 +66,6 @@
-
-
Comments
-
{% render_field form.comments %}
diff --git a/netbox/templates/ipam/service_edit.html b/netbox/templates/ipam/service_edit.html
index 709d816c1..f2a2f711d 100644
--- a/netbox/templates/ipam/service_edit.html
+++ b/netbox/templates/ipam/service_edit.html
@@ -53,9 +53,6 @@
-
-
Comments
-
{% render_field form.comments %}
diff --git a/netbox/templates/ipam/vlan_edit.html b/netbox/templates/ipam/vlan_edit.html
index f4432efe3..0c4b68e7e 100644
--- a/netbox/templates/ipam/vlan_edit.html
+++ b/netbox/templates/ipam/vlan_edit.html
@@ -56,9 +56,6 @@
-
-
Comments
-
{% render_field form.comments %}
diff --git a/netbox/templates/wireless/wirelesslink_edit.html b/netbox/templates/wireless/wirelesslink_edit.html
deleted file mode 100644
index 462ae5148..000000000
--- a/netbox/templates/wireless/wirelesslink_edit.html
+++ /dev/null
@@ -1,39 +0,0 @@
-{% extends 'generic/object_edit.html' %}
-{% load form_helpers %}
-
-{% block form %}
-
-
-
-
-
Side A
-
- {% render_field form.device_a %}
- {% render_field form.interface_a %}
-
-
-
-
-
-
Side B
-
- {% render_field form.device_b %}
- {% render_field form.interface_b %}
-
-
-
-
-
-
Comments
-
- {% render_field form.comments %}
-
- {% if form.custom_fields %}
-
-
-
Custom Fields
-
- {% render_custom_fields form %}
-
- {% endif %}
-{% endblock %}
diff --git a/netbox/utilities/forms/fields/fields.py b/netbox/utilities/forms/fields/fields.py
index ee9543452..bb8226e4d 100644
--- a/netbox/utilities/forms/fields/fields.py
+++ b/netbox/utilities/forms/fields/fields.py
@@ -34,8 +34,8 @@ class CommentField(forms.CharField):
Markdown syntax is supported
"""
- def __init__(self, *, label='', help_text=help_text, required=False, **kwargs):
- super().__init__(label=label, help_text=help_text, required=required, **kwargs)
+ def __init__(self, *, help_text=help_text, required=False, **kwargs):
+ super().__init__(help_text=help_text, required=required, **kwargs)
class SlugField(forms.SlugField):
diff --git a/netbox/utilities/templates/form_helpers/render_field.html b/netbox/utilities/templates/form_helpers/render_field.html
index 85c04df92..85bd86bbc 100644
--- a/netbox/utilities/templates/form_helpers/render_field.html
+++ b/netbox/utilities/templates/form_helpers/render_field.html
@@ -3,11 +3,8 @@
- {# Render the field label, except for: #}
- {# 1. Checkboxes (label appears to the right of the field #}
- {# 2. Textareas with no label set (will expand across entire row) #}
- {% if field|widget_type == 'checkboxinput' or field|widget_type == 'textarea' or field|widget_type == 'markdownwidget' and not label %}
- {% else %}
+ {# Render the field label, except for checkboxes #}
+ {% if field|widget_type != 'checkboxinput' %}
{{ label }}