wagtail 6.1.3__py3-none-any.whl → 6.2rc1__py3-none-any.whl

wagtail/contrib/redirects/locale/en/LC_MESSAGES/django.po

@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-04-18 17:28+0100\n"
+"POT-Creation-Date: 2024-07-19 16:26+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -22,20 +22,19 @@ msgstr ""
 msgid "Wagtail redirects"
 msgstr ""
 
-#: filters.py:12 templates/wagtailredirects/list.html:20 views.py:102
-#: views.py:466
+#: filters.py:26 views.py:102 views.py:119
 msgid "Type"
 msgstr ""
 
-#: filters.py:15
+#: filters.py:29
 msgid "Permanent"
 msgstr ""
 
-#: filters.py:16
+#: filters.py:30
 msgid "Temporary"
 msgstr ""
 
-#: filters.py:18
+#: filters.py:32
 msgid "All"
 msgstr ""
 
@@ -68,59 +67,59 @@ msgstr ""
 msgid "To field"
 msgstr ""
 
-#: models.py:12
+#: models.py:13
 msgid "redirect from"
 msgstr ""
 
-#: models.py:16
+#: models.py:17
 msgid "site"
 msgstr ""
 
-#: models.py:24 models.py:84
+#: models.py:25 models.py:85
 msgid "permanent"
 msgstr ""
 
-#: models.py:27
+#: models.py:28
 msgid ""
 "Recommended. Permanent redirects ensure search engines forget the old page "
 "(the 'Redirect from') and index the new page instead."
 msgstr ""
 
-#: models.py:33
+#: models.py:34
 msgid "redirect to a page"
 msgstr ""
 
-#: models.py:39
+#: models.py:40
 msgid "target page route"
 msgstr ""
 
-#: models.py:41
+#: models.py:42
 msgid ""
 "Optionally specify a route on the target page to redirect to. Leave blank to "
 "redirect to the default page route."
 msgstr ""
 
-#: models.py:48
+#: models.py:49
 msgid "redirect to any URL"
 msgstr ""
 
-#: models.py:51
+#: models.py:52
 msgid "automatically created"
 msgstr ""
 
-#: models.py:56
+#: models.py:57
 msgid "created at"
 msgstr ""
 
-#: models.py:86
+#: models.py:87
 msgid "temporary"
 msgstr ""
 
-#: models.py:203
+#: models.py:204
 msgid "redirect"
 msgstr ""
 
-#: models.py:204
+#: models.py:205
 msgid "redirects"
 msgstr ""
 
@@ -130,7 +129,6 @@ msgid "Add redirect"
 msgstr ""
 
 #: templates/wagtailredirects/add.html:19
-#: templates/wagtailredirects/edit.html:19
 msgid "Save"
 msgstr ""
 
@@ -141,7 +139,7 @@ msgstr ""
 
 #: templates/wagtailredirects/choose_import_file.html:6
 #: templates/wagtailredirects/confirm_import.html:6
-#: templates/wagtailredirects/import_summary.html:5 views.py:116
+#: templates/wagtailredirects/import_summary.html:5 views.py:130
 msgid "Import redirects"
 msgstr ""
 
@@ -191,19 +189,6 @@ msgstr ""
 msgid "Preview"
 msgstr ""
 
-#: templates/wagtailredirects/edit.html:3
-#, python-format
-msgid "Editing %(title)s"
-msgstr ""
-
-#: templates/wagtailredirects/edit.html:5
-msgid "Editing"
-msgstr ""
-
-#: templates/wagtailredirects/edit.html:21
-msgid "Delete redirect"
-msgstr ""
-
 #: templates/wagtailredirects/import_summary.html:3
 #: templates/wagtailredirects/import_summary.html:6
 msgid "Summary"
@@ -215,14 +200,11 @@ msgid ""
 "Found %(total)s redirects, created %(successes)s and found %(errors)s errors."
 msgstr ""
 
-#: templates/wagtailredirects/import_summary.html:17
-#: templates/wagtailredirects/list.html:12
-#: templates/wagtailredirects/list.html:15 views.py:84 views.py:463
+#: templates/wagtailredirects/import_summary.html:17 views.py:84 views.py:116
 msgid "From"
 msgstr ""
 
-#: templates/wagtailredirects/import_summary.html:18
-#: templates/wagtailredirects/list.html:19 views.py:96 views.py:465
+#: templates/wagtailredirects/import_summary.html:18 views.py:96 views.py:118
 msgid "To"
 msgstr ""
 
@@ -246,76 +228,59 @@ msgid ""
 "href=\"%(wagtailredirects_add_redirect_url)s\">add one</a>?"
 msgstr ""
 
-#: templates/wagtailredirects/list.html:18 views.py:90 views.py:464
+#: views.py:90 views.py:117
 msgid "Site"
 msgstr ""
 
-#: templates/wagtailredirects/list.html:27
-msgid "Edit this redirect"
-msgstr ""
-
-#: templates/wagtailredirects/reports/redirects_report.html:8
-#: templates/wagtailredirects/reports/redirects_report.html:13
-msgid "No redirects found."
-msgstr ""
-
-#: views.py:122
-msgid "Export redirects"
+#: views.py:148
+msgid "The redirect could not be saved due to errors."
 msgstr ""
 
-#: views.py:147
+#: views.py:153
 #, python-format
 msgid "Redirect '%(redirect_title)s' updated."
 msgstr ""
 
-#: views.py:152 views.py:220
-msgid "Edit"
-msgstr ""
-
-#: views.py:158
-msgid "The redirect could not be saved due to errors."
-msgstr ""
-
-#: views.py:190
+#: views.py:173
 #, python-format
 msgid "Redirect '%(redirect_title)s' deleted."
 msgstr ""
 
-#: views.py:215
+#: views.py:198
 #, python-format
 msgid "Redirect '%(redirect_title)s' added."
 msgstr ""
 
-#: views.py:227
+#: views.py:203
+msgid "Edit"
+msgstr ""
+
+#: views.py:210
 msgid "The redirect could not be created due to errors."
 msgstr ""
 
-#: views.py:266
+#: views.py:249
 msgid "Search redirects"
 msgstr ""
 
-#: views.py:280
+#: views.py:263
 #, python-format
 msgid "File format of type \"%(extension)s\" is not supported"
 msgstr ""
 
-#: views.py:297
+#: views.py:280
 #, python-format
 msgid "Imported file has a wrong encoding: %(error_message)s"
 msgstr ""
 
-#: views.py:304
+#: views.py:287
 #, python-format
 msgid "%(error)s encountered while trying to read file: %(filename)s"
 msgstr ""
 
-#: views.py:395
+#: views.py:378
 #, python-format
 msgid "Imported %(total)d redirect"
 msgid_plural "Imported %(total)d redirects"
 msgstr[0] ""
 msgstr[1] ""
-
-#: views.py:451
-msgid "Export Redirects"
-msgstr ""

wagtail/contrib/redirects/models.py

@@ -2,6 +2,7 @@ from urllib.parse import urlparse
 
 from django.db import models
 from django.urls import Resolver404
+from django.utils.functional import cached_property
 from django.utils.translation import gettext_lazy as _
 
 from wagtail.models import Page
@@ -63,10 +64,10 @@ class Redirect(models.Model):
     def __str__(self):
         return self.title
 
-    @property
+    @cached_property
     def link(self):
         if self.redirect_page:
-            page = self.redirect_page.specific
+            page = self.redirect_page.specific_deferred
             base_url = page.url
             if not self.redirect_page_route_path:
                 return base_url
@@ -145,7 +146,7 @@ class Redirect(models.Model):
         url_parsed = urlparse(url)
 
         # Path must start with / but not end with /
-        path = url_parsed[2]
+        path = url_parsed.path
         if not path.startswith("/"):
             path = "/" + path
 
@@ -153,12 +154,12 @@ class Redirect(models.Model):
             path = path[:-1]
 
         # Parameters must be sorted alphabetically
-        parameters = url_parsed[3]
+        parameters = url_parsed.params
         parameters_components = parameters.split(";")
         parameters = ";".join(sorted(parameters_components))
 
         # Query string components must be sorted alphabetically
-        query_string = url_parsed[4]
+        query_string = url_parsed.query
         query_string_components = query_string.split("&")
         query_string = "&".join(sorted(query_string_components))
 

wagtail/contrib/redirects/templates/wagtailredirects/edit.html

@@ -1,38 +1 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n wagtailadmin_tags %}
-{% block titletag %}{% blocktrans trimmed with title=redirect.title %}Editing {{ title }}{% endblocktrans %}{% endblock %}
-{% block content %}
-    {% trans "Editing" as editing_str %}
-    {% include "wagtailadmin/shared/header.html" with title=editing_str subtitle=redirect.title icon="redirect" %}
-
-    {% include "wagtailadmin/shared/non_field_errors.html" %}
-
-    <form action="{% url 'wagtailredirects:edit' redirect.id %}" method="POST" class="nice-padding" novalidate>
-        {% csrf_token %}
-
-        <ul class="fields">
-            {% for field in form.visible_fields %}
-                <li>{% formattedfield field %}</li>
-            {% endfor %}
-
-            <li>
-                <input type="submit" value="{% trans 'Save' %}" class="button" />
-                {% if user_can_delete %}
-                    <a href="{% url 'wagtailredirects:delete' redirect.id %}" class="button no">{% trans "Delete redirect" %}</a>
-                {% endif %}
-            </li>
-        </ul>
-    </form>
-
-{% endblock %}
-
-{% block extra_js %}
-    {{ block.super }}
-    {% include "wagtailadmin/pages/_editor_js.html" %}
-    {{ form.media.js }}
-{% endblock %}
-
-{% block extra_css %}
-    {{ block.super }}
-    {{ form.media.css }}
-{% endblock %}
+{% extends "wagtailadmin/generic/edit.html" %}

wagtail/contrib/redirects/tests/test_redirects.py

@@ -1,6 +1,10 @@
+from io import BytesIO
+
 from django.conf import settings
+from django.contrib.auth.models import Permission
 from django.test import TestCase, override_settings
 from django.urls import reverse
+from openpyxl.reader.excel import load_workbook
 
 from wagtail.admin.admin_url_finder import AdminURLFinder
 from wagtail.contrib.redirects import models
@@ -592,7 +596,14 @@ class TestRedirects(TestCase):
         self.assertIs(redirect.is_permanent, True)
 
 
+@override_settings(
+    CACHES={"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
+)
 class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.site = Site.objects.first()
+
     def setUp(self):
         self.login()
 
@@ -607,6 +618,7 @@ class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
             [{"url": "", "label": "Redirects"}],
             response.content,
         )
+        self.assertContains(response, "No redirects have been created")
 
     def test_search(self):
         models.Redirect.objects.create(
@@ -692,6 +704,94 @@ class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase)
                     (ordering,),
                 )
 
+    def test_filtering_by_type(self):
+        temp_redirect = models.Redirect.add_redirect("/from", "/to", False)
+        perm_redirect = models.Redirect.add_redirect("/cat", "/dog", True)
+
+        response = self.get(params={"is_permanent": "True"})
+
+        self.assertContains(response, perm_redirect.old_path)
+        self.assertNotContains(response, temp_redirect.old_path)
+
+    def test_filtering_by_site(self):
+        site_redirect = models.Redirect.add_redirect("/cat", "/dog")
+        site_redirect.site = self.site
+        site_redirect.save()
+        nosite_redirect = models.Redirect.add_redirect("/from", "/to")
+
+        response = self.get(params={"site": self.site.pk})
+
+        self.assertContains(response, site_redirect.old_path)
+        self.assertNotContains(response, nosite_redirect.old_path)
+
+    def test_csv_export(self):
+        models.Redirect.add_redirect("/from", "/to", False)
+
+        # Session, User, UserProfile, Redirects
+        with self.assertNumQueries(4):
+            response = self.get(params={"export": "csv"})
+
+            csv_data = response.getvalue().decode().split("\n")
+
+        self.assertEqual(response.status_code, 200)
+        csv_header = csv_data[0]
+        csv_entries = csv_data[1:]
+        csv_entries = csv_entries[:-1]  # Drop empty last line
+
+        self.assertEqual(csv_header, "From,To,Type,Site\r")
+        self.assertEqual(len(csv_entries), 1)
+        self.assertEqual(csv_entries[0], "/from,/to,temporary,\r")
+
+    def test_xlsx_export(self):
+        models.Redirect.add_redirect("/from", "/to", True)
+
+        # Session, User, UserProfile, Redirects
+        with self.assertNumQueries(4):
+            response = self.get(params={"export": "xlsx"})
+            workbook_data = response.getvalue()
+
+        self.assertEqual(response.status_code, 200)
+
+        worksheet = load_workbook(filename=BytesIO(workbook_data))["Sheet1"]
+        cell_array = [[cell.value for cell in row] for row in worksheet.rows]
+
+        self.assertEqual(cell_array[0], ["From", "To", "Type", "Site"])
+        self.assertEqual(len(cell_array), 2)
+        self.assertEqual(cell_array[1], ["/from", "/to", "permanent", None])
+
+    def test_num_queries_in_export(self):
+        page = Page.objects.get(id=2)
+        for i in range(3):
+            models.Redirect.add_redirect(f"/from{i}", "/to", False)
+            models.Redirect.add_redirect(f"/from-site{i}", "/to", False, site=self.site)
+            models.Redirect.add_redirect(f"/to-page{i}", page, False)
+
+        response = self.get(params={"export": "csv"})
+        csv_data = response.getvalue().decode().strip().split("\n")
+        # Session, User, UserProfile, Redirects
+        with self.assertNumQueries(4):
+            response = self.get(params={"export": "csv"})
+            csv_data = response.getvalue().decode().strip().split("\n")
+
+        self.assertEqual(len(csv_data), 10)
+
+    def test_redirect_page_filter_only_includes_relevant_pages(self):
+        """
+        The redirect_page filter should only include pages referenced by Redirect objects.
+        """
+        response = self.get()
+        request = response.context["request"]
+        qs = response.context["filters"].filters["redirect_page"].queryset(request)
+        self.assertQuerySetEqual(qs, Page.objects.none())
+
+        page = Page.objects.get(id=2)
+        models.Redirect.add_redirect("/to-page", page, False)
+
+        response = self.get()
+        request = response.context["request"]
+        qs = response.context["filters"].filters["redirect_page"].queryset(request)
+        self.assertQuerySetEqual(qs, Page.objects.filter(pk=2))
+
 
 class TestRedirectsAddView(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
@@ -849,7 +949,7 @@ class TestRedirectsAddView(WagtailTestUtils, TestCase):
         self.assertIsNone(redirects.first().site)
 
 
-class TestRedirectsEditView(WagtailTestUtils, TestCase):
+class TestRedirectsEditView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     def setUp(self):
         # Create a redirect to edit
         self.redirect = models.Redirect(
@@ -876,6 +976,13 @@ class TestRedirectsEditView(WagtailTestUtils, TestCase):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailredirects/edit.html")
+        self.assertBreadcrumbsItemsRendered(
+            [
+                {"url": reverse("wagtailredirects:index"), "label": "Redirects"},
+                {"url": "", "label": "/test"},
+            ],
+            response.content,
+        )
 
         url_finder = AdminURLFinder(self.user)
         expected_url = "/admin/redirects/%d/" % self.redirect.id
@@ -957,6 +1064,39 @@ class TestRedirectsEditView(WagtailTestUtils, TestCase):
         # Should not redirect to index
         self.assertEqual(response.status_code, 200)
 
+    def test_get_with_no_permission(self, redirect_id=None):
+        self.user.is_superuser = False
+        self.user.save()
+        # Only basic access_admin permission is given
+        self.user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label="wagtailadmin",
+                codename="access_admin",
+            )
+        )
+
+        response = self.get()
+        self.assertEqual(response.status_code, 302)
+        self.assertRedirects(response, reverse("wagtailadmin_home"))
+
+    def test_get_with_edit_permission_only(self):
+        self.user.is_superuser = False
+        self.user.save()
+        self.user.user_permissions.add(
+            Permission.objects.get(
+                content_type__app_label="wagtailadmin",
+                codename="access_admin",
+            ),
+            Permission.objects.get(
+                content_type__app_label="wagtailredirects",
+                codename="change_redirect",
+            ),
+        )
+
+        response = self.get()
+        self.assertEqual(response.status_code, 200)
+        self.assertTemplateUsed(response, "wagtailredirects/edit.html")
+
 
 class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
     def setUp(self):

wagtail/contrib/redirects/urls.py

@@ -7,9 +7,8 @@ urlpatterns = [
     path("", views.IndexView.as_view(), name="index"),
     path("results/", views.IndexView.as_view(results_only=True), name="index_results"),
     path("add/", views.add, name="add"),
-    path("<int:redirect_id>/", views.edit, name="edit"),
+    path("<int:redirect_id>/", views.EditView.as_view(), name="edit"),
     path("<int:redirect_id>/delete/", views.delete, name="delete"),
     path("import/", views.start_import, name="start_import"),
     path("import/process/", views.process_import, name="process_import"),
-    path("report", views.RedirectsReportView.as_view(), name="report"),
 ]