Просмотр исходного кода

Fixes #20028: Restore bulk deletion button for bookmarks, notifications, and subscriptions (#20032)

Jeremy Stretch 6 месяцев назад
Родитель
Сommit
33d891e67b

+ 3 - 2
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',)

+ 1 - 3
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 %}

+ 1 - 3
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 %}

+ 1 - 3
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 %}