From 33d891e67ba4ef51e167f1c27d2bf703eb4fc9d9 Mon Sep 17 00:00:00 2001
From: Jeremy Stretch <jstretch@netboxlabs.com>
Date: Wed, 6 Aug 2025 16:56:22 -0400
Subject: [PATCH] Fixes #20028: Restore bulk deletion button for bookmarks,
 notifications, and subscriptions (#20032)

---
 netbox/extras/tables/tables.py              | 5 +++--
 netbox/templates/account/bookmarks.html     | 4 +---
 netbox/templates/account/notifications.html | 4 +---
 netbox/templates/account/subscriptions.html | 4 +---
 4 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/netbox/extras/tables/tables.py b/netbox/extras/tables/tables.py
index d55d7fc48..2af89bc9a 100644
--- a/netbox/extras/tables/tables.py
+++ b/netbox/extras/tables/tables.py
@@ -340,11 +340,12 @@ class TableConfigTable(NetBoxTable):
 
 class BookmarkTable(NetBoxTable):
     object_type = columns.ContentTypeColumn(
-        verbose_name=_('Object Types'),
+        verbose_name=_('Object Type'),
     )
     object = tables.Column(
         verbose_name=_('Object'),
-        linkify=True
+        linkify=True,
+        orderable=False
     )
     actions = columns.ActionsColumn(
         actions=('delete',)
diff --git a/netbox/templates/account/bookmarks.html b/netbox/templates/account/bookmarks.html
index f7aa9bf57..2e3ff5691 100644
--- a/netbox/templates/account/bookmarks.html
+++ b/netbox/templates/account/bookmarks.html
@@ -24,9 +24,7 @@
 
     {# Form buttons #}
     <div class="btn-list d-print-none mt-2">
-      {% if 'bulk_delete' in actions %}
-        {% bulk_delete_button model query_params=request.GET %}
-      {% endif %}
+      {% bulk_delete_button model query_params=request.GET %}
     </div>
   </form>
 {% endblock %}
diff --git a/netbox/templates/account/notifications.html b/netbox/templates/account/notifications.html
index 5a471ef25..46feb80b0 100644
--- a/netbox/templates/account/notifications.html
+++ b/netbox/templates/account/notifications.html
@@ -24,9 +24,7 @@
 
     {# Form buttons #}
     <div class="btn-list d-print-none mt-2">
-      {% if 'bulk_delete' in actions %}
-        {% bulk_delete_button model query_params=request.GET %}
-      {% endif %}
+      {% bulk_delete_button model query_params=request.GET %}
     </div>
   </form>
 {% endblock %}
diff --git a/netbox/templates/account/subscriptions.html b/netbox/templates/account/subscriptions.html
index d97053d63..0ae1060cc 100644
--- a/netbox/templates/account/subscriptions.html
+++ b/netbox/templates/account/subscriptions.html
@@ -24,9 +24,7 @@
 
     {# Form buttons #}
     <div class="btn-list d-print-none mt-2">
-      {% if 'bulk_delete' in actions %}
-        {% bulk_delete_button model query_params=request.GET %}
-      {% endif %}
+      {% bulk_delete_button model query_params=request.GET %}
     </div>
   </form>
 {% endblock %}