kopia lustrzana https://github.com/wagtail/wagtail
Standardise delete button label in edit views to 'Delete'
rodzic
47c2c0c82e
commit
ef5ccea61d
|
@ -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(
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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()
|
||||
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
||||
|
|
|
@ -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
|
||||
|
|
Ładowanie…
Reference in New Issue