diff --git a/wagtail/admin/tests/pages/test_page_usage.py b/wagtail/admin/tests/pages/test_page_usage.py index d075b5f862..4dba47804e 100644 --- a/wagtail/admin/tests/pages/test_page_usage.py +++ b/wagtail/admin/tests/pages/test_page_usage.py @@ -44,6 +44,7 @@ class TestPageUsage(WagtailTestUtils, TestCase): self.assertContains(response, "Hello world!") self.assertContains(response, "(Private page chooser model)") + self.assertContains(response, "Page chooser model", html=True) def test_has_editable_usage(self): form_page = FormPageWithRedirect( @@ -70,3 +71,4 @@ class TestPageUsage(WagtailTestUtils, TestCase): response, reverse("wagtailadmin_pages:edit", args=(form_page.id,)) ) self.assertContains(response, "Thank you redirect page") + self.assertContains(response, "Form page with redirect", html=True) diff --git a/wagtail/admin/views/generic/usage.py b/wagtail/admin/views/generic/usage.py index d9b9c8da63..80232982dc 100644 --- a/wagtail/admin/views/generic/usage.py +++ b/wagtail/admin/views/generic/usage.py @@ -1,3 +1,4 @@ +from django.utils.text import capfirst from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy @@ -38,6 +39,14 @@ class UsageView(BaseObjectMixin, IndexView): accessor="label", get_url=lambda r: r["edit_url"], ), + tables.Column( + "content_type", + label=_("Type"), + # Use the content type from the ReferenceIndex object instead of the + # object itself, so we can get the specific content type without + # having to fetch the specific object from the database. + accessor=lambda r: capfirst(r["references"][0].model_name), + ), tables.ReferencesColumn( "field", label=_("Field"), diff --git a/wagtail/documents/tests/test_admin_views.py b/wagtail/documents/tests/test_admin_views.py index cc5c05388c..55afd310e6 100644 --- a/wagtail/documents/tests/test_admin_views.py +++ b/wagtail/documents/tests/test_admin_views.py @@ -1857,6 +1857,7 @@ class TestGetUsage(WagtailTestUtils, TestCase): event_page_related_link.save() response = self.client.get(reverse("wagtaildocs:document_usage", args=(1,))) self.assertContains(response, "Christmas") + self.assertContains(response, "Event page", html=True) def test_usage_page_no_usage(self): response = self.client.get(reverse("wagtaildocs:document_usage", args=(1,))) @@ -1898,6 +1899,7 @@ class TestGetUsage(WagtailTestUtils, TestCase): # User has no permission over the page linked to, so should not see its details self.assertNotContains(response, "Christmas") self.assertContains(response, "(Private page)") + self.assertContains(response, "Event page", html=True) def test_usage_page_without_change_permission(self): # Create a user with add_document permission but not change_document diff --git a/wagtail/images/tests/test_admin_views.py b/wagtail/images/tests/test_admin_views.py index 1e190b77e2..5806aa3ebf 100644 --- a/wagtail/images/tests/test_admin_views.py +++ b/wagtail/images/tests/test_admin_views.py @@ -1221,6 +1221,7 @@ class TestUsage(WagtailTestUtils, TestCase): reverse("wagtailimages:image_usage", args=[self.image.id]) ) self.assertContains(response, "Christmas") + self.assertContains(response, "Event page", html=True) def test_usage_page_no_usage(self): response = self.client.get( @@ -1282,6 +1283,7 @@ class TestUsage(WagtailTestUtils, TestCase): # User has no permission over the page linked to, so should not see its details self.assertNotContains(response, "Christmas") self.assertContains(response, "(Private page)") + self.assertContains(response, "Event page", html=True) def test_usage_page_without_change_permission(self): # Create a user with add_image permission but not change_image diff --git a/wagtail/snippets/tests/test_snippets.py b/wagtail/snippets/tests/test_snippets.py index e3df7d69aa..06f663f6cf 100644 --- a/wagtail/snippets/tests/test_snippets.py +++ b/wagtail/snippets/tests/test_snippets.py @@ -3860,7 +3860,7 @@ class TestSnippetUsageView(WagtailTestUtils, TestCase): page.save() gfk_page = GenericSnippetPage( - title="Generic snippet page", + title="Foobar Title", snippet_content_object=Advert.objects.get(pk=1), ) page.add_child(instance=gfk_page) @@ -3872,7 +3872,8 @@ class TestSnippetUsageView(WagtailTestUtils, TestCase): ) ) self.assertContains(response, "Welcome to the Wagtail test site!") - self.assertContains(response, "Generic snippet page") + self.assertContains(response, "Foobar Title") + self.assertContains(response, "Generic snippet page", html=True) self.assertContains(response, "Snippet content object") def test_usage_without_edit_permission_on_snippet(self): @@ -3922,6 +3923,7 @@ class TestSnippetUsageView(WagtailTestUtils, TestCase): self.assertEqual(response.status_code, 200) self.assertNotContains(response, "Welcome to the Wagtail test site!") self.assertContains(response, "(Private page)") + self.assertContains(response, "Page", html=True) class TestSnippetHistory(WagtailTestUtils, TestCase):