From ef5ccea61dcb4fb15e72696420707810e7a581d4 Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Mon, 14 Oct 2024 16:24:46 +0100 Subject: [PATCH] Standardise delete button label in edit views to 'Delete' --- wagtail/admin/tests/test_collections_views.py | 22 ++++++++++++++----- wagtail/admin/views/collections.py | 1 - wagtail/documents/views/documents.py | 1 - wagtail/images/views/images.py | 1 - wagtail/locales/views.py | 1 - wagtail/sites/views.py | 1 - wagtail/users/views/groups.py | 1 - 7 files changed, 17 insertions(+), 11 deletions(-) diff --git a/wagtail/admin/tests/test_collections_views.py b/wagtail/admin/tests/test_collections_views.py index 0e0f9d1bf0..e57e7031c0 100644 --- a/wagtail/admin/tests/test_collections_views.py +++ b/wagtail/admin/tests/test_collections_views.py @@ -337,7 +337,11 @@ class TestEditCollectionAsSuperuser(AdminTemplateTestUtils, WagtailTestUtils, Te def test_get(self): response = self.get() self.assertEqual(response.status_code, 200) - self.assertContains(response, "Delete collection") + delete_url = reverse( + "wagtailadmin_collections:delete", + args=(self.collection.id,), + ) + self.assertContains(response, delete_url) self.assertBreadcrumbsItemsRendered( [ {"url": "/admin/collections/", "label": "Collections"}, @@ -501,7 +505,11 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase response = self.get(collection_id=self.marketing_collection.id) self.assertEqual(response.status_code, 200) self.assertEqual(list(response.context["form"].fields.keys()), ["name"]) - self.assertNotContains(response, "Delete collection") + delete_url = reverse( + "wagtailadmin_collections:delete", + args=(self.marketing_collection.id,), + ) + self.assertNotContains(response, delete_url) def test_cannot_move_collection_permissions_are_assigned_to_with_minimal_permission( self, @@ -552,9 +560,13 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase self.test_marketing_user_cannot_move_collection_permissions_are_assigned_to_post() def test_page_shows_delete_link_only_if_delete_permitted(self): + delete_url = reverse( + "wagtailadmin_collections:delete", + args=(self.marketing_sub_collection.id,), + ) # Retrieve edit form and check fields response = self.get(collection_id=self.marketing_sub_collection.id) - self.assertNotContains(response, "Delete collection") + self.assertNotContains(response, delete_url) # Add delete permission to a different collection and try again, # ensure that it checks against the tree structure, and not just a @@ -566,7 +578,7 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase permission=self.delete_permission, ) response = self.get(collection_id=self.marketing_sub_collection.id) - self.assertNotContains(response, "Delete collection") + self.assertNotContains(response, delete_url) # Add delete permission to parent collection and try again GroupCollectionPermission.objects.create( @@ -575,7 +587,7 @@ class TestEditCollection(CollectionInstanceTestUtils, WagtailTestUtils, TestCase permission=self.delete_permission, ) response = self.get(collection_id=self.marketing_sub_collection.id) - self.assertContains(response, "Delete collection") + self.assertContains(response, delete_url) class TestDeleteCollectionAsSuperuser( diff --git a/wagtail/admin/views/collections.py b/wagtail/admin/views/collections.py index f4dd8ac9b3..02a015c37b 100644 --- a/wagtail/admin/views/collections.py +++ b/wagtail/admin/views/collections.py @@ -75,7 +75,6 @@ class Edit(EditView): template_name = "wagtailadmin/collections/edit.html" success_message = gettext_lazy("Collection '%(object)s' updated.") error_message = gettext_lazy("The collection could not be saved due to errors.") - delete_item_label = gettext_lazy("Delete collection") edit_url_name = "wagtailadmin_collections:edit" index_url_name = "wagtailadmin_collections:index" delete_url_name = "wagtailadmin_collections:delete" diff --git a/wagtail/documents/views/documents.py b/wagtail/documents/views/documents.py index 9058288952..42597d8556 100644 --- a/wagtail/documents/views/documents.py +++ b/wagtail/documents/views/documents.py @@ -197,7 +197,6 @@ class EditView(generic.EditView): delete_url_name = "wagtaildocs:delete" header_icon = "doc-full-inverse" context_object_name = "document" - delete_item_label = gettext_lazy("Delete document") _show_breadcrumbs = True @cached_property diff --git a/wagtail/images/views/images.py b/wagtail/images/views/images.py index e7bf6ac338..4880a3abbd 100644 --- a/wagtail/images/views/images.py +++ b/wagtail/images/views/images.py @@ -134,7 +134,6 @@ class EditView(generic.EditView): url_generator_url_name = "wagtailimages:url_generator" header_icon = "image" context_object_name = "image" - delete_item_label = gettext_lazy("Delete image") _show_breadcrumbs = True @cached_property diff --git a/wagtail/locales/views.py b/wagtail/locales/views.py index 9d6e455931..13ca825825 100644 --- a/wagtail/locales/views.py +++ b/wagtail/locales/views.py @@ -54,7 +54,6 @@ class CreateView(generic.CreateView): class EditView(generic.EditView): success_message = gettext_lazy("Locale '%(object)s' updated.") error_message = gettext_lazy("The locale could not be saved due to errors.") - delete_item_label = gettext_lazy("Delete locale") context_object_name = "locale" queryset = Locale.all_objects.all() diff --git a/wagtail/sites/views.py b/wagtail/sites/views.py index 8ca1f6cdff..fc3108ad9d 100644 --- a/wagtail/sites/views.py +++ b/wagtail/sites/views.py @@ -41,7 +41,6 @@ class CreateView(generic.CreateView): class EditView(generic.EditView): success_message = _("Site '%(object)s' updated.") error_message = _("The site could not be saved due to errors.") - delete_item_label = _("Delete site") context_object_name = "site" diff --git a/wagtail/users/views/groups.py b/wagtail/users/views/groups.py index b421aa5305..97c93d6587 100644 --- a/wagtail/users/views/groups.py +++ b/wagtail/users/views/groups.py @@ -113,7 +113,6 @@ class CreateView(PermissionPanelFormsMixin, generic.CreateView): class EditView(PermissionPanelFormsMixin, generic.EditView): success_message = _("Group '%(object)s' updated.") error_message = _("The group could not be saved due to errors.") - delete_item_label = _("Delete group") context_object_name = "group" @cached_property