Show content type on usage view table

pull/10072/head
Sage Abdullah 2023-02-10 10:59:21 +00:00
rodzic 78b94f567c
commit 6165f8a004
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: EB1A33CC51CC0217
5 zmienionych plików z 19 dodań i 2 usunięć

Wyświetl plik

@ -44,6 +44,7 @@ class TestPageUsage(WagtailTestUtils, TestCase):
self.assertContains(response, "Hello world!") self.assertContains(response, "Hello world!")
self.assertContains(response, "(Private page chooser model)") self.assertContains(response, "(Private page chooser model)")
self.assertContains(response, "<td>Page chooser model</td>", html=True)
def test_has_editable_usage(self): def test_has_editable_usage(self):
form_page = FormPageWithRedirect( form_page = FormPageWithRedirect(
@ -70,3 +71,4 @@ class TestPageUsage(WagtailTestUtils, TestCase):
response, reverse("wagtailadmin_pages:edit", args=(form_page.id,)) response, reverse("wagtailadmin_pages:edit", args=(form_page.id,))
) )
self.assertContains(response, "Thank you redirect page") self.assertContains(response, "Thank you redirect page")
self.assertContains(response, "<td>Form page with redirect</td>", html=True)

Wyświetl plik

@ -1,3 +1,4 @@
from django.utils.text import capfirst
from django.utils.translation import gettext as _ from django.utils.translation import gettext as _
from django.utils.translation import gettext_lazy from django.utils.translation import gettext_lazy
@ -38,6 +39,14 @@ class UsageView(BaseObjectMixin, IndexView):
accessor="label", accessor="label",
get_url=lambda r: r["edit_url"], 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( tables.ReferencesColumn(
"field", "field",
label=_("Field"), label=_("Field"),

Wyświetl plik

@ -1857,6 +1857,7 @@ class TestGetUsage(WagtailTestUtils, TestCase):
event_page_related_link.save() event_page_related_link.save()
response = self.client.get(reverse("wagtaildocs:document_usage", args=(1,))) response = self.client.get(reverse("wagtaildocs:document_usage", args=(1,)))
self.assertContains(response, "Christmas") self.assertContains(response, "Christmas")
self.assertContains(response, "<td>Event page</td>", html=True)
def test_usage_page_no_usage(self): def test_usage_page_no_usage(self):
response = self.client.get(reverse("wagtaildocs:document_usage", args=(1,))) 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 # User has no permission over the page linked to, so should not see its details
self.assertNotContains(response, "Christmas") self.assertNotContains(response, "Christmas")
self.assertContains(response, "(Private page)") self.assertContains(response, "(Private page)")
self.assertContains(response, "<td>Event page</td>", html=True)
def test_usage_page_without_change_permission(self): def test_usage_page_without_change_permission(self):
# Create a user with add_document permission but not change_document # Create a user with add_document permission but not change_document

Wyświetl plik

@ -1221,6 +1221,7 @@ class TestUsage(WagtailTestUtils, TestCase):
reverse("wagtailimages:image_usage", args=[self.image.id]) reverse("wagtailimages:image_usage", args=[self.image.id])
) )
self.assertContains(response, "Christmas") self.assertContains(response, "Christmas")
self.assertContains(response, "<td>Event page</td>", html=True)
def test_usage_page_no_usage(self): def test_usage_page_no_usage(self):
response = self.client.get( 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 # User has no permission over the page linked to, so should not see its details
self.assertNotContains(response, "Christmas") self.assertNotContains(response, "Christmas")
self.assertContains(response, "(Private page)") self.assertContains(response, "(Private page)")
self.assertContains(response, "<td>Event page</td>", html=True)
def test_usage_page_without_change_permission(self): def test_usage_page_without_change_permission(self):
# Create a user with add_image permission but not change_image # Create a user with add_image permission but not change_image

Wyświetl plik

@ -3860,7 +3860,7 @@ class TestSnippetUsageView(WagtailTestUtils, TestCase):
page.save() page.save()
gfk_page = GenericSnippetPage( gfk_page = GenericSnippetPage(
title="Generic snippet page", title="Foobar Title",
snippet_content_object=Advert.objects.get(pk=1), snippet_content_object=Advert.objects.get(pk=1),
) )
page.add_child(instance=gfk_page) 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, "Welcome to the Wagtail test site!")
self.assertContains(response, "Generic snippet page") self.assertContains(response, "Foobar Title")
self.assertContains(response, "<td>Generic snippet page</td>", html=True)
self.assertContains(response, "Snippet content object") self.assertContains(response, "Snippet content object")
def test_usage_without_edit_permission_on_snippet(self): def test_usage_without_edit_permission_on_snippet(self):
@ -3922,6 +3923,7 @@ class TestSnippetUsageView(WagtailTestUtils, TestCase):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertNotContains(response, "Welcome to the Wagtail test site!") self.assertNotContains(response, "Welcome to the Wagtail test site!")
self.assertContains(response, "(Private page)") self.assertContains(response, "(Private page)")
self.assertContains(response, "<td>Page</td>", html=True)
class TestSnippetHistory(WagtailTestUtils, TestCase): class TestSnippetHistory(WagtailTestUtils, TestCase):