From 8de9f521519c21c529c79b053cf261d9bac53d84 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <stretch@packetlife.net>
Date: Tue, 28 Jan 2020 16:09:10 -0500
Subject: [PATCH] Fixes #4033: Restore missing comments field label of various
 bulk edit forms

---
 docs/release-notes/version-2.7.md | 1 +
 netbox/circuits/forms.py          | 3 ++-
 netbox/dcim/forms.py              | 8 +++++---
 netbox/virtualization/forms.py    | 6 ++++--
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/docs/release-notes/version-2.7.md b/docs/release-notes/version-2.7.md
index ae4be060a..ff8391585 100644
--- a/docs/release-notes/version-2.7.md
+++ b/docs/release-notes/version-2.7.md
@@ -23,6 +23,7 @@
 * [#4027](https://github.com/netbox-community/netbox/issues/4027) - Repair schema migration for #3569 to convert IP addresses with DHCP status
 * [#4028](https://github.com/netbox-community/netbox/issues/4028) - Correct URL patterns to match Unicode characters in tag slugs
 * [#4030](https://github.com/netbox-community/netbox/issues/4030) - Fix exception when setting interfaces to tagged mode in bulk
+* [#4033](https://github.com/netbox-community/netbox/issues/4033) - Restore missing comments field label of various bulk edit forms
 
 ---
 
diff --git a/netbox/circuits/forms.py b/netbox/circuits/forms.py
index d5d78e7bd..165e32eb3 100644
--- a/netbox/circuits/forms.py
+++ b/netbox/circuits/forms.py
@@ -89,7 +89,8 @@ class ProviderBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEdi
         label='Admin contact'
     )
     comments = CommentField(
-        widget=SmallTextarea()
+        widget=SmallTextarea,
+        label='Comments'
     )
 
     class Meta:
diff --git a/netbox/dcim/forms.py b/netbox/dcim/forms.py
index e713d2c7c..ca5d25389 100644
--- a/netbox/dcim/forms.py
+++ b/netbox/dcim/forms.py
@@ -676,7 +676,8 @@ class RackBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEditFor
         widget=StaticSelect2()
     )
     comments = CommentField(
-        widget=SmallTextarea
+        widget=SmallTextarea,
+        label='Comments'
     )
 
     class Meta:
@@ -4418,8 +4419,9 @@ class PowerFeedBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEd
     max_utilization = forms.IntegerField(
         required=False
     )
-    comments = forms.CharField(
-        required=False
+    comments = CommentField(
+        widget=SmallTextarea,
+        label='Comments'
     )
 
     class Meta:
diff --git a/netbox/virtualization/forms.py b/netbox/virtualization/forms.py
index ae516fcb3..cbabc20c4 100644
--- a/netbox/virtualization/forms.py
+++ b/netbox/virtualization/forms.py
@@ -171,7 +171,8 @@ class ClusterBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldBulkEdit
         )
     )
     comments = CommentField(
-        widget=SmallTextarea()
+        widget=SmallTextarea,
+        label='Comments'
     )
 
     class Meta:
@@ -535,7 +536,8 @@ class VirtualMachineBulkEditForm(BootstrapMixin, AddRemoveTagsForm, CustomFieldB
         label='Disk (GB)'
     )
     comments = CommentField(
-        widget=SmallTextarea()
+        widget=SmallTextarea,
+        label='Comments'
     )
 
     class Meta: