wagtail 6.0.2__py3-none-any.whl → 6.1rc2__py3-none-any.whl

wagtail/contrib/redirects/signal_handlers.py

@@ -134,7 +134,7 @@ def create_redirects(page: Page, page_old: Page, sites: Iterable[Site]) -> None:
     # For bulk-creating redirects in batches
     batch = BatchRedirectCreator(max_size=2000, ignore_conflicts=True)
 
-    # Treat the page that was updated / moved separately to it's decendants,
+    # Treat the page that was updated / moved separately to it's descendants,
     # because there may be changes to fields other than `slug` or `url_path`
     # that impact the URL.
     old_urls = _page_urls_for_sites(page_old, sites, cache_target=page)

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

@@ -1,36 +1 @@
-{% extends "wagtailadmin/base.html" %}
-{% load i18n %}
-{% load static wagtailadmin_tags %}
-
-{% block bodyclass %}redirects{% endblock %}
-
-{% block titletag %}{% trans "Redirects" %}{% endblock %}
-
-{% block content %}
-    {% trans "Redirects" as redirects_str %}
-    {% url 'wagtailredirects:index' as search_results_url %}
-    {% if user_can_add %}
-        {% url "wagtailredirects:add" as add_link %}
-        {% trans "Add redirect" as add_str %}
-        {% url "wagtailredirects:start_import" as import_link %}
-        {% url "wagtailredirects:report" as report_link %}
-        {% trans "Import redirects" as import_str %}
-        {% trans "Export redirects" as export_str %}
-        {% fragment as redirect_actions %}
-            {% fragment as button %}
-                <a href="{{ import_link }}" class="button bicolor button--icon">{% icon name="doc-full-inverse" wrapped=1 %}{{ import_str }}</a>
-            {% endfragment %}
-            {% dropdown_button classname="w-ml-2.5" button=button toggle_icon="arrow-down" %}
-                <a class="button bicolor button--icon" href="{{ report_link }}">{% icon name="download" wrapped=1 %}{{ export_str }}</a>
-            {% enddropdown_button %}
-        {% endfragment %}
-        {% include "wagtailadmin/shared/header.html" with title=redirects_str icon="redirect" search_url="wagtailredirects:index" query_parameters=query_parameters action_url=add_link action_text=add_str action_icon="plus" extra_actions=redirect_actions search_results_url=search_results_url search_target="#redirects-results" %}
-    {% else %}
-        {% include "wagtailadmin/shared/header.html" with title=redirects_str icon="redirect" search_url="wagtailredirects:index" search_results_url=search_results_url search_target="#redirects-results" %}
-    {% endif %}
-    <div class="nice-padding">
-        <div id="redirects-results" class="redirects">
-            {% include "wagtailredirects/results.html" %}
-        </div>
-    </div>
-{% endblock %}
+{% extends "wagtailadmin/generic/index.html" %}

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

@@ -0,0 +1,18 @@
+{% extends "wagtailadmin/generic/index_results.html" %}
+{% load i18n %}
+
+{% block no_results_message %}
+    {% if query_string %}
+        <p role="alert">
+            {% blocktrans trimmed %}
+                Sorry, no redirects match "<em>{{ query_string }}</em>"
+            {% endblocktrans %}
+        </p>
+    {% else %}
+        <p>
+            {% blocktrans trimmed with wagtailredirects_add_redirect_url=add_url %}
+                No redirects have been created. Why not <a href="{{ wagtailredirects_add_redirect_url }}">add one</a>?
+            {% endblocktrans %}
+        </p>
+    {% endif %}
+{% endblock %}

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

@@ -0,0 +1,8 @@
+{% load i18n wagtailadmin_tags %}
+<td class="w-truncate w-max-w-0">
+    {% if url %}
+        <a href="{{ url }}" class="nolink">{{ value }}</a>
+    {% else %}
+        {{ value }}
+    {% endif %}
+</td>

wagtail/contrib/redirects/tests/test_import_command.py

@@ -241,7 +241,7 @@ class TestImportCommand(TestCase):
         "wagtail.contrib.redirects.management.commands.import_redirects.get_input",
         return_value="Y",
     )
-    def test_successfull_ask_imports_redirect(self, get_input):
+    def test_successful_ask_imports_redirect(self, get_input):
         invalid_file = tempfile.NamedTemporaryFile(mode="w+", encoding="utf-8")
         invalid_file.write("from,to\n")
         invalid_file.write("/alpha,http://omega.test/")

wagtail/contrib/redirects/tests/test_redirects.py

@@ -1,3 +1,4 @@
+from django.conf import settings
 from django.test import TestCase, override_settings
 from django.urls import reverse
 
@@ -7,6 +8,7 @@ from wagtail.log_actions import registry as log_registry
 from wagtail.models import Page, Site
 from wagtail.test.routablepage.models import RoutablePageTest
 from wagtail.test.utils import WagtailTestUtils
+from wagtail.test.utils.template_tests import AdminTemplateTestUtils
 
 
 @override_settings(
@@ -200,6 +202,24 @@ class TestRedirects(TestCase):
             response, "/redirectto", status_code=302, fetch_redirect_response=False
         )
 
+    def test_redirect_without_trailing_slash(self):
+        # Create a redirect
+        redirect = models.Redirect(old_path="/redirectme", redirect_link="/redirectto")
+        redirect.save()
+
+        # confirm that CommonMiddleware's append-slash behaviour is enabled
+        self.assertTrue(settings.APPEND_SLASH)
+
+        response = self.client.get("/redirectme")
+        # Request should be picked up by RedirectMiddleware, not CommonMiddleware
+        # (which would redirect to /redirectme/ instead).
+        # Before Django 4.2, CommonMiddleware performed the 'add trailing slash' test
+        # during the initial request processing, which took precedence over RedirectMiddleware
+        # and caused a double redirect (/redirectme -> /redirectme/ -> /redirectto).
+        self.assertRedirects(
+            response, "/redirectto", status_code=301, fetch_redirect_response=False
+        )
+
     def test_redirect_stripping_query_string(self):
         # Create a redirect which includes a query string
         redirect_with_query_string = models.Redirect(
@@ -572,7 +592,7 @@ class TestRedirects(TestCase):
         self.assertIs(redirect.is_permanent, True)
 
 
-class TestRedirectsIndexView(WagtailTestUtils, TestCase):
+class TestRedirectsIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase):
     def setUp(self):
         self.login()
 
@@ -583,11 +603,24 @@ class TestRedirectsIndexView(WagtailTestUtils, TestCase):
         response = self.get()
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailredirects/index.html")
+        self.assertBreadcrumbsItemsRendered(
+            [{"url": "", "label": "Redirects"}],
+            response.content,
+        )
 
     def test_search(self):
-        response = self.get({"q": "Hello"})
-        self.assertEqual(response.status_code, 200)
-        self.assertEqual(response.context["query_string"], "Hello")
+        models.Redirect.objects.create(
+            old_path="/aaargh", redirect_link="http://torchbox.com/"
+        )
+        models.Redirect.objects.create(
+            old_path="/torchbox", redirect_link="http://aaargh.com/"
+        )
+        models.Redirect.objects.create(
+            old_path="/unrelated", redirect_link="http://unrelated.com/"
+        )
+        response = self.get({"q": "Aaargh"})
+        self.assertEqual(len(response.context["redirects"]), 2)
+        self.assertEqual(response.context["query_string"], "Aaargh")
 
     def test_search_results(self):
         models.Redirect.objects.create(
@@ -596,8 +629,15 @@ class TestRedirectsIndexView(WagtailTestUtils, TestCase):
         models.Redirect.objects.create(
             old_path="/torchbox", redirect_link="http://aaargh.com/"
         )
-        response = self.get({"q": "aaargh"})
+        models.Redirect.objects.create(
+            old_path="/unrelated", redirect_link="http://unrelated.com/"
+        )
+        response = self.client.get(
+            reverse("wagtailredirects:index_results"),
+            {"q": "Aaargh"},
+        )
         self.assertEqual(len(response.context["redirects"]), 2)
+        self.assertEqual(response.context["query_string"], "Aaargh")
 
     def test_pagination(self):
         # page numbers in range should be accepted
@@ -607,7 +647,7 @@ class TestRedirectsIndexView(WagtailTestUtils, TestCase):
         response = self.get({"p": 9999})
         self.assertEqual(response.status_code, 404)
 
-    def test_listing_order(self):
+    def test_default_ordering(self):
         for i in range(0, 10):
             models.Redirect.objects.create(
                 old_path="/redirect%d" % i, redirect_link="http://torchbox.com/"
@@ -621,6 +661,37 @@ class TestRedirectsIndexView(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertEqual(response.context["redirects"][0].old_path, "/aaargh")
 
+    def test_custom_orderings(self):
+        models.Redirect.objects.create(
+            old_path="/test", redirect_link="http://wagtail.org/"
+        )
+        valid_orderings = {
+            "old_path",
+            "-old_path",
+            "site__site_name",
+            "-site__site_name",
+            "is_permanent",
+            "-is_permanent",
+        }
+        for ordering in valid_orderings:
+            with self.subTest(ordering=ordering):
+                response = self.get({"ordering": ordering})
+                self.assertEqual(response.status_code, 200)
+                soup = self.get_soup(response.content)
+                links = {
+                    reverse("wagtailredirects:index") + "?ordering=" + other
+                    for other in valid_orderings
+                    if not other.startswith("-")
+                    and other != ordering
+                    or other == f"-{ordering}"
+                }
+                for link in links:
+                    self.assertIsNotNone(soup.find("a", {"href": link}))
+                self.assertEqual(
+                    response.context["object_list"].query.order_by,
+                    (ordering,),
+                )
+
 
 class TestRedirectsAddView(WagtailTestUtils, TestCase):
     fixtures = ["test.json"]
@@ -810,7 +881,7 @@ class TestRedirectsEditView(WagtailTestUtils, TestCase):
         expected_url = "/admin/redirects/%d/" % self.redirect.id
         self.assertEqual(url_finder.get_edit_url(self.redirect), expected_url)
 
-    def test_nonexistant_redirect(self):
+    def test_nonexistent_redirect(self):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
 
     def test_edit(self):
@@ -914,7 +985,7 @@ class TestRedirectsDeleteView(WagtailTestUtils, TestCase):
         self.assertEqual(response.status_code, 200)
         self.assertTemplateUsed(response, "wagtailredirects/confirm_delete.html")
 
-    def test_nonexistant_redirect(self):
+    def test_nonexistent_redirect(self):
         self.assertEqual(self.get(redirect_id=100000).status_code, 404)
 
     def test_delete(self):

wagtail/contrib/redirects/urls.py

@@ -4,7 +4,8 @@ from wagtail.contrib.redirects import views
 
 app_name = "wagtailredirects"
 urlpatterns = [
-    path("", views.index, name="index"),
+    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>/delete/", views.delete, name="delete"),

wagtail/contrib/redirects/views.py

@@ -1,23 +1,23 @@
 import os
 
 from django.core.exceptions import PermissionDenied, SuspiciousOperation
-from django.core.paginator import InvalidPage, Paginator
 from django.db import transaction
-from django.db.models import Q
-from django.http import Http404
 from django.shortcuts import get_object_or_404, redirect, render
 from django.template.response import TemplateResponse
 from django.urls import reverse
 from django.utils.encoding import force_str
+from django.utils.functional import cached_property
 from django.utils.translation import gettext as _
-from django.utils.translation import ngettext
+from django.utils.translation import gettext_lazy, ngettext
 from django.views.decorators.http import require_http_methods
-from django.views.decorators.vary import vary_on_headers
 
 from wagtail.admin import messages
 from wagtail.admin.auth import PermissionPolicyChecker
 from wagtail.admin.forms.search import SearchForm
+from wagtail.admin.ui.tables import Column, StatusTagColumn, TitleColumn
+from wagtail.admin.views import generic
 from wagtail.admin.views.reports import ReportView
+from wagtail.admin.widgets.button import Button
 from wagtail.contrib.redirects import models
 from wagtail.contrib.redirects.filters import RedirectsReportFilterSet
 from wagtail.contrib.redirects.forms import (
@@ -26,6 +26,7 @@ from wagtail.contrib.redirects.forms import (
     ImportForm,
     RedirectForm,
 )
+from wagtail.contrib.redirects.models import Redirect
 from wagtail.contrib.redirects.permissions import permission_policy
 from wagtail.contrib.redirects.utils import (
     get_file_storage,
@@ -39,62 +40,91 @@ from wagtail.log_actions import log
 permission_checker = PermissionPolicyChecker(permission_policy)
 
 
-@permission_checker.require_any("add", "change", "delete")
-@vary_on_headers("X-Requested-With")
-def index(request):
-    query_string = request.GET.get("q", "")
-    ordering = request.GET.get("ordering", "old_path")
+class RedirectTargetColumn(Column):
+    cell_template_name = "wagtailredirects/redirect_target_cell.html"
+    url_name = "wagtailadmin_pages:edit"
 
-    redirects = models.Redirect.objects.prefetch_related("redirect_page", "site")
+    def get_value(self, instance):
+        if instance.redirect_page:
+            return instance.redirect_page.get_admin_display_title()
+        return instance.redirect_link
 
-    # Search
-    if query_string:
-        redirects = redirects.filter(
-            Q(old_path__icontains=query_string)
-            | Q(redirect_page__url_path__icontains=query_string)
-            | Q(redirect_link__icontains=query_string)
-        )
+    def get_url(self, instance):
+        if instance.redirect_page:
+            return reverse(self.url_name, args=[instance.redirect_page_id])
+        return None
 
-    # Ordering (A bit useless at the moment as only 'old_path' is allowed)
-    if ordering not in ["old_path"]:
-        ordering = "old_path"
+    def get_cell_context_data(self, instance, parent_context):
+        context = super().get_cell_context_data(instance, parent_context)
+        context["url"] = self.get_url(instance)
+        return context
 
-    redirects = redirects.order_by(ordering)
 
-    # Pagination
-    paginator = Paginator(redirects, per_page=20)
-    try:
-        redirects = paginator.page(request.GET.get("p", 1))
-    except InvalidPage:
-        raise Http404
+class IndexView(generic.IndexView):
+    template_name = "wagtailredirects/index.html"
+    results_template_name = "wagtailredirects/index_results.html"
+    permission_policy = permission_policy
+    model = Redirect
+    header_icon = "redirect"
+    add_item_label = gettext_lazy("Add redirect")
+    context_object_name = "redirects"
+    index_url_name = "wagtailredirects:index"
+    index_results_url_name = "wagtailredirects:index_results"
+    add_url_name = "wagtailredirects:add"
+    edit_url_name = "wagtailredirects:edit"
+    delete_url_name = "wagtailredirects:delete"
+    default_ordering = "old_path"
+    paginate_by = 20
+    page_title = gettext_lazy("Redirects")
+    search_fields = ["old_path", "redirect_page__url_path", "redirect_link"]
+    _show_breadcrumbs = True
+    columns = [
+        TitleColumn(
+            "old_path",
+            label=gettext_lazy("From"),
+            url_name="wagtailredirects:edit",
+            sort_key="old_path",
+        ),
+        Column(
+            "site",
+            label=gettext_lazy("Site"),
+            width="25%",
+            sort_key="site__site_name",
+        ),
+        RedirectTargetColumn(
+            "redirect_page",
+            label=gettext_lazy("To"),
+            width="30%",
+        ),
+        StatusTagColumn(
+            "is_permanent",
+            accessor="get_is_permanent_display",
+            label=gettext_lazy("Type"),
+            width="10%",
+            sort_key="is_permanent",
+            primary=lambda r: r.is_permanent,
+        ),
+    ]
 
-    # Render template
-    if request.headers.get("x-requested-with") == "XMLHttpRequest":
-        return TemplateResponse(
-            request,
-            "wagtailredirects/results.html",
-            {
-                "ordering": ordering,
-                "redirects": redirects,
-                "query_string": query_string,
-            },
-        )
-    else:
-        return TemplateResponse(
-            request,
-            "wagtailredirects/index.html",
-            {
-                "ordering": ordering,
-                "redirects": redirects,
-                "query_string": query_string,
-                "search_form": SearchForm(
-                    data={"q": query_string} if query_string else None,
-                ),
-                "user_can_add": permission_policy.user_has_permission(
-                    request.user, "add"
-                ),
-            },
-        )
+    def get_base_queryset(self):
+        return super().get_base_queryset().select_related("redirect_page", "site")
+
+    @cached_property
+    def header_more_buttons(self):
+        return [
+            Button(
+                _("Import redirects"),
+                url=reverse("wagtailredirects:start_import"),
+                icon_name="doc-full-inverse",
+                priority=90,
+            ),
+            Button(
+                _("Export redirects"),
+                url=reverse("wagtailredirects:report"),
+                icon_name="download",
+                priority=100,
+            ),
+        ]
 
 
 @permission_checker.require("change")

wagtail/contrib/search_promotions/admin_urls.py

@@ -4,7 +4,8 @@ from wagtail.contrib.search_promotions import views
 
 app_name = "wagtailsearchpromotions"
 urlpatterns = [
-    path("", views.index, name="index"),
+    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:query_id>/", views.edit, name="edit"),
     path("<int:query_id>/delete/", views.delete, name="delete"),

wagtail/contrib/search_promotions/locale/af/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Afrikaans (http://app.transifex.com/torchbox/wagtail/language/"

wagtail/contrib/search_promotions/locale/ar/LC_MESSAGES/django.po

@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: ROGER MICHAEL ASHLEY ALLEN <rogermaallen@gmail.com>, 2015\n"
 "Language-Team: Arabic (http://app.transifex.com/torchbox/wagtail/language/"
@@ -86,29 +86,17 @@ msgstr "تقدم إلى تحت"
 msgid "Promoted search results"
 msgstr "نتائج البحث المطلوب"
 
-msgid "Search Terms"
-msgstr "مصطلحات البحث"
-
-msgid "Add new promoted result"
-msgstr "أضف نتيجة البحث"
-
-msgid "Search term(s)"
-msgstr "مصطلح , مصطلحات البحث"
-
-msgid "Promoted results"
-msgstr "النتائج المطلوبة"
-
-msgid "Views (past week)"
-msgstr "المواقع المبحوثة في الأسبوع الماضي"
-
-msgid "Edit this promotion"
-msgstr "تحرير هذا العرض"
-
-msgid "External link"
-msgstr "حلقة خارجية"
+#, python-format
+msgid "Sorry, no promoted results match \"<em>%(query_string)s</em>\""
+msgstr "عذرًا ، لا توجد نتائج تمت ترقيتها تطابق \"<em> %(query_string)s</em>\""
 
-msgid "None"
-msgstr "لا أحد"
+#, python-format
+msgid ""
+"No promoted results have been created. Why not <a "
+"href=\"%(wagtailsearchpromotions_add_url)s\">add one</a>?"
+msgstr ""
+"لم يتم إنشاء نتائج ترويجية. لماذا لا <a "
+"href=\"%(wagtailsearchpromotions_add_url)s\">تضيف واحدة</a>؟"
 
 msgid "Popular search terms"
 msgstr "مصطلحات البحث الاكثر شعبية"
@@ -119,33 +107,32 @@ msgstr "بحث"
 msgid "Terms"
 msgstr "مصطلحات"
 
+msgid "Views (past week)"
+msgstr "المواقع المبحوثة في الأسبوع الماضي"
+
 msgid "No results found"
 msgstr "لاتوجد نتائج"
 
 msgid "Choose from popular search terms"
 msgstr "احتر من المصطلخات الأكثر شعبية"
 
-#, python-format
-msgid "There is %(counter)s match"
-msgid_plural "There are %(counter)s matches"
-msgstr[0] "هنالك %(counter)sتَطابق"
-msgstr[1] "هنالك %(counter)sتَطابق"
-msgstr[2] "هنالك %(counter)sتَطابق"
-msgstr[3] "هنالك %(counter)sتَطابق"
-msgstr[4] "هنالك %(counter)sتَطابق"
-msgstr[5] "هنالك %(counter)sتَطابق"
+msgid "External link"
+msgstr "حلقة خارجية"
 
-#, python-format
-msgid "Sorry, no promoted results match \"<em>%(query_string)s</em>\""
-msgstr "عذرًا ، لا توجد نتائج تمت ترقيتها تطابق \"<em> %(query_string)s</em>\""
+msgid "None"
+msgstr "لا أحد"
 
-#, python-format
-msgid ""
-"No promoted results have been created. Why not <a "
-"href=\"%(wagtailsearchpromotions_add_url)s\">add one</a>?"
-msgstr ""
-"لم يتم إنشاء نتائج ترويجية. لماذا لا <a "
-"href=\"%(wagtailsearchpromotions_add_url)s\">تضيف واحدة</a>؟"
+msgid "Search Terms"
+msgstr "مصطلحات البحث"
+
+msgid "Add new promoted result"
+msgstr "أضف نتيجة البحث"
+
+msgid "Search term(s)"
+msgstr "مصطلح , مصطلحات البحث"
+
+msgid "Promoted results"
+msgstr "النتائج المطلوبة"
 
 #, python-format
 msgid "Editor's picks for '%(query)s' created."

wagtail/contrib/search_promotions/locale/az_AZ/LC_MESSAGES/django.po

@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+0100\n"
 "PO-Revision-Date: 2015-08-26 14:04+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Azerbaijani (Azerbaijan) (http://app.transifex.com/torchbox/"