From b3a9c79f403d40071b5bfc64d0e7d308c174f2ff Mon Sep 17 00:00:00 2001 From: Sage Abdullah Date: Mon, 27 Mar 2023 11:24:07 +0100 Subject: [PATCH] Rename Snippets type_index.html and results.html templates to index.html and index_results.html --- .../snippets/{type_index.html => index.html} | 2 +- .../{results.html => index_results.html} | 0 wagtail/snippets/tests/test_snippets.py | 18 ++++++++---------- wagtail/snippets/views/snippets.py | 4 ++-- 4 files changed, 11 insertions(+), 13 deletions(-) rename wagtail/snippets/templates/wagtailsnippets/snippets/{type_index.html => index.html} (96%) rename wagtail/snippets/templates/wagtailsnippets/snippets/{results.html => index_results.html} (100%) diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/type_index.html b/wagtail/snippets/templates/wagtailsnippets/snippets/index.html similarity index 96% rename from wagtail/snippets/templates/wagtailsnippets/snippets/type_index.html rename to wagtail/snippets/templates/wagtailsnippets/snippets/index.html index b0e2e9d800..4978b0f863 100644 --- a/wagtail/snippets/templates/wagtailsnippets/snippets/type_index.html +++ b/wagtail/snippets/templates/wagtailsnippets/snippets/index.html @@ -25,7 +25,7 @@
- {% include "wagtailsnippets/snippets/results.html" %} + {% include "wagtailsnippets/snippets/index_results.html" %}
{% if filters %} {% include "wagtailadmin/shared/filters.html" %} diff --git a/wagtail/snippets/templates/wagtailsnippets/snippets/results.html b/wagtail/snippets/templates/wagtailsnippets/snippets/index_results.html similarity index 100% rename from wagtail/snippets/templates/wagtailsnippets/snippets/results.html rename to wagtail/snippets/templates/wagtailsnippets/snippets/index_results.html diff --git a/wagtail/snippets/tests/test_snippets.py b/wagtail/snippets/tests/test_snippets.py index a7d14e7928..2428a61d9d 100644 --- a/wagtail/snippets/tests/test_snippets.py +++ b/wagtail/snippets/tests/test_snippets.py @@ -109,7 +109,7 @@ class TestSnippetListView(WagtailTestUtils, TestCase): def test_simple(self): response = self.get() self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") self.assertEqual(response.context["header_icon"], "snippet") def get_with_limited_permissions(self): @@ -140,9 +140,7 @@ class TestSnippetListView(WagtailTestUtils, TestCase): for page in pages: response = self.get({"p": page}) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed( - response, "wagtailsnippets/snippets/type_index.html" - ) + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") def test_displays_add_button(self): self.assertContains(self.get(), "Add advert") @@ -469,7 +467,7 @@ class TestSnippetListViewWithSearchableSnippet(WagtailTestUtils, TransactionTest def test_simple(self): response = self.get() self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # All snippets should be in items items = list(response.context["page_obj"].object_list) @@ -483,7 +481,7 @@ class TestSnippetListViewWithSearchableSnippet(WagtailTestUtils, TransactionTest def test_empty_q(self): response = self.get({"q": ""}) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # All snippets should be in items items = list(response.context["page_obj"].object_list) @@ -4562,7 +4560,7 @@ class TestAddOnlyPermissions(WagtailTestUtils, TestCase): def test_get_index(self): response = self.client.get(reverse("wagtailsnippets_tests_advert:list")) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # user should get an "Add advert" button self.assertContains(response, "Add advert") @@ -4616,7 +4614,7 @@ class TestEditOnlyPermissions(WagtailTestUtils, TestCase): def test_get_index(self): response = self.client.get(reverse("wagtailsnippets_tests_advert:list")) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # user should not get an "Add advert" button self.assertNotContains(response, "Add advert") @@ -4668,7 +4666,7 @@ class TestDeleteOnlyPermissions(WagtailTestUtils, TestCase): def test_get_index(self): response = self.client.get(reverse("wagtailsnippets_tests_advert:list")) self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # user should not get an "Add advert" button self.assertNotContains(response, "Add advert") @@ -4861,7 +4859,7 @@ class TestSnippetListViewWithCustomPrimaryKey(WagtailTestUtils, TestCase): def test_simple(self): response = self.get() self.assertEqual(response.status_code, 200) - self.assertTemplateUsed(response, "wagtailsnippets/snippets/type_index.html") + self.assertTemplateUsed(response, "wagtailsnippets/snippets/index.html") # All snippets should be in items items = list(response.context["page_obj"].object_list) diff --git a/wagtail/snippets/views/snippets.py b/wagtail/snippets/views/snippets.py index 37228f5913..e1aeeffa94 100644 --- a/wagtail/snippets/views/snippets.py +++ b/wagtail/snippets/views/snippets.py @@ -188,9 +188,9 @@ class IndexView(generic.IndexViewOptionalFeaturesMixin, generic.IndexView): def get_template_names(self): if self.results_only: - return ["wagtailsnippets/snippets/results.html"] + return ["wagtailsnippets/snippets/index_results.html"] else: - return ["wagtailsnippets/snippets/type_index.html"] + return ["wagtailsnippets/snippets/index.html"] class CreateView(generic.CreateEditViewOptionalFeaturesMixin, generic.CreateView):