Skip to content

Commit 33d891e

Browse files
Fixes #20028: Restore bulk deletion button for bookmarks, notifications, and subscriptions (#20032)
1 parent 4ce47e7 commit 33d891e

File tree

4 files changed

+6
-11
lines changed

4 files changed

+6
-11
lines changed

netbox/extras/tables/tables.py

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -340,11 +340,12 @@ class Meta(NetBoxTable.Meta):
340340

341341
class BookmarkTable(NetBoxTable):
342342
object_type = columns.ContentTypeColumn(
343-
verbose_name=_('Object Types'),
343+
verbose_name=_('Object Type'),
344344
)
345345
object = tables.Column(
346346
verbose_name=_('Object'),
347-
linkify=True
347+
linkify=True,
348+
orderable=False
348349
)
349350
actions = columns.ActionsColumn(
350351
actions=('delete',)

netbox/templates/account/bookmarks.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
{# Form buttons #}
2626
<div class="btn-list d-print-none mt-2">
27-
{% if 'bulk_delete' in actions %}
28-
{% bulk_delete_button model query_params=request.GET %}
29-
{% endif %}
27+
{% bulk_delete_button model query_params=request.GET %}
3028
</div>
3129
</form>
3230
{% endblock %}

netbox/templates/account/notifications.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
{# Form buttons #}
2626
<div class="btn-list d-print-none mt-2">
27-
{% if 'bulk_delete' in actions %}
28-
{% bulk_delete_button model query_params=request.GET %}
29-
{% endif %}
27+
{% bulk_delete_button model query_params=request.GET %}
3028
</div>
3129
</form>
3230
{% endblock %}

netbox/templates/account/subscriptions.html

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,7 @@
2424

2525
{# Form buttons #}
2626
<div class="btn-list d-print-none mt-2">
27-
{% if 'bulk_delete' in actions %}
28-
{% bulk_delete_button model query_params=request.GET %}
29-
{% endif %}
27+
{% bulk_delete_button model query_params=request.GET %}
3028
</div>
3129
</form>
3230
{% endblock %}

0 commit comments

Comments
 (0)