wagtail 6.0.1__py3-none-any.whl → 6.1rc1__py3-none-any.whl

wagtail/contrib/forms/views.py

@@ -6,13 +6,15 @@ from django.core.exceptions import PermissionDenied
 from django.shortcuts import get_object_or_404, redirect
 from django.urls import reverse
 from django.utils.translation import gettext, gettext_lazy, ngettext
-from django.views.generic import ListView, TemplateView
+from django.views.generic import TemplateView
+from django_filters import DateFromToRangeFilter
 
 from wagtail.admin import messages
+from wagtail.admin.filters import DateRangePickerWidget, WagtailFilterSet
 from wagtail.admin.ui.tables import Column, TitleColumn
 from wagtail.admin.views import generic
+from wagtail.admin.views.generic.base import BaseListingView
 from wagtail.admin.views.mixins import SpreadsheetExportMixin
-from wagtail.contrib.forms.forms import SelectDateForm
 from wagtail.contrib.forms.utils import get_forms_for_user
 from wagtail.models import Page
 
@@ -70,8 +72,6 @@ class FormPagesListView(generic.IndexView):
     is_searchable = False
 
     def get_breadcrumbs_items(self):
-        if not self.model:
-            return self.breadcrumbs_items
         return self.breadcrumbs_items + [
             {"url": "", "label": self.page_title, "sublabel": gettext("Pages")},
         ]
@@ -144,22 +144,36 @@ class DeleteSubmissionsView(TemplateView):
         return context
 
 
-class SubmissionsListView(SpreadsheetExportMixin, ListView):
+class SubmissionsListFilterSet(WagtailFilterSet):
+    date = DateFromToRangeFilter(
+        label=gettext_lazy("Submission date"),
+        field_name="submit_time",
+        widget=DateRangePickerWidget,
+    )
+
+
+class SubmissionsListView(SpreadsheetExportMixin, BaseListingView):
     """Lists submissions for the provided form page"""
 
     template_name = "wagtailforms/submissions_index.html"
+    results_template_name = "wagtailforms/list_submissions.html"
     context_object_name = "submissions"
     form_page = None
-    ordering = ("-submit_time",)
+    default_ordering = ("-submit_time",)
     ordering_csv = ("submit_time",)  # keep legacy CSV ordering
     orderable_fields = (
         "id",
         "submit_time",
     )  # used to validate ordering in URL
     page_title = gettext_lazy("Form data")
-    select_date_form = None
+    header_icon = "form"
     paginate_by = 20
-    page_kwarg = "p"
+    filterset_class = SubmissionsListFilterSet
+    forms_index_url_name = "wagtailforms:index"
+    index_url_name = "wagtailforms:list_submissions"
+    index_results_url_name = "wagtailforms:list_submissions_results"
+    _show_breadcrumbs = True
+    show_export_buttons = True
 
     def dispatch(self, request, *args, **kwargs):
         """Check permissions and set the form page"""
@@ -177,29 +191,17 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
 
         return super().dispatch(request, *args, **kwargs)
 
-    def get_queryset(self):
-        """Return queryset of form submissions with filter and order_by applied"""
+    def get_filterset_kwargs(self):
+        kwargs = super().get_filterset_kwargs()
+        kwargs["queryset"] = self.get_base_queryset()
+        return kwargs
+
+    def get_base_queryset(self):
+        """Return queryset of form submissions"""
         submission_class = self.form_page.get_submission_class()
         queryset = submission_class._default_manager.filter(page=self.form_page)
-
-        filtering = self.get_filtering()
-        if filtering and isinstance(filtering, dict):
-            queryset = queryset.filter(**filtering)
-
-        ordering = self.get_ordering()
-        if ordering:
-            if isinstance(ordering, str):
-                ordering = (ordering,)
-            queryset = queryset.order_by(*ordering)
-
         return queryset
 
-    def get_paginate_by(self, queryset):
-        """Get the number of items to paginate by, or ``None`` for no pagination"""
-        if self.is_export:
-            return None
-        return self.paginate_by
-
     def get_validated_ordering(self):
         """Return a dict of field names with ordering labels if ordering is valid"""
         orderable_fields = self.orderable_fields or ()
@@ -208,7 +210,7 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
             #  Revert to CSV order_by submit_time ascending for backwards compatibility
             default_ordering = self.ordering_csv or ()
         else:
-            default_ordering = self.ordering or ()
+            default_ordering = self.default_ordering or ()
         if isinstance(default_ordering, str):
             default_ordering = (default_ordering,)
         ordering_strs = self.request.GET.getlist("order_by") or list(default_ordering)
@@ -229,25 +231,6 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
         ordering = self.get_validated_ordering()
         return [values[0] + name for name, values in ordering.items()]
 
-    def get_filtering(self):
-        """Return filering as a dict for submissions queryset"""
-        self.select_date_form = SelectDateForm(self.request.GET)
-        result = {}
-        if self.select_date_form.is_valid():
-            date_from = self.select_date_form.cleaned_data.get("date_from")
-            date_to = self.select_date_form.cleaned_data.get("date_to")
-            if date_to:
-                # careful: date_to must be increased by 1 day
-                # as submit_time is a time so will always be greater
-                date_to += datetime.timedelta(days=1)
-                if date_from:
-                    result["submit_time__range"] = [date_from, date_to]
-                else:
-                    result["submit_time__lte"] = date_to
-            elif date_from:
-                result["submit_time__gte"] = date_from
-        return result
-
     def get_filename(self):
         """Returns the base filename for the generated spreadsheet data file"""
         return "{}-export-{}".format(
@@ -268,6 +251,28 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
         )
         return row_dict
 
+    def get_index_url(self):
+        return reverse(self.index_url_name, args=(self.form_page.id,))
+
+    def get_index_results_url(self):
+        return reverse(self.index_results_url_name, args=(self.form_page.id,))
+
+    def get_page_subtitle(self):
+        return self.form_page.get_admin_display_title()
+
+    def get_breadcrumbs_items(self):
+        return self.breadcrumbs_items + [
+            {
+                "url": reverse(self.forms_index_url_name),
+                "label": gettext("Forms"),
+            },
+            {
+                "url": "",
+                "label": self.get_page_title(),
+                "sublabel": self.get_page_subtitle(),
+            },
+        ]
+
     def get_context_data(self, **kwargs):
         """Return context for view"""
         context = super().get_context_data(**kwargs)
@@ -275,7 +280,6 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
         data_fields = self.form_page.get_data_fields()
         data_rows = []
         context["submissions"] = submissions
-        context["page_title"] = self.page_title
         if not self.is_export:
             # Build data_rows as list of dicts containing model_id and fields
             for submission in submissions:
@@ -310,7 +314,6 @@ class SubmissionsListView(SpreadsheetExportMixin, ListView):
             context.update(
                 {
                     "form_page": self.form_page,
-                    "select_date_form": self.select_date_form,
                     "data_headings": data_headings,
                     "data_rows": data_rows,
                 }

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

@@ -6,14 +6,14 @@
 # David Llop, 2014
 # David Llop, 2014
 # David Llop, 2014
-# Roger Pons <rogerpons@gmail.com>, 2017,2023
+# Roger Pons <rogerpons@gmail.com>, 2017,2023-2024
 msgid ""
 msgstr ""
 "Project-Id-Version: Wagtail\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-01-24 13:51+0000\n"
 "PO-Revision-Date: 2014-02-20 21:04+0000\n"
-"Last-Translator: Roger Pons <rogerpons@gmail.com>, 2017,2023\n"
+"Last-Translator: Roger Pons <rogerpons@gmail.com>, 2017,2023-2024\n"
 "Language-Team: Catalan (http://app.transifex.com/torchbox/wagtail/language/"
 "ca/)\n"
 "MIME-Version: 1.0\n"
@@ -243,7 +243,7 @@ msgid "The redirect could not be created due to errors."
 msgstr "No s'ha pogut crear el redireccionament."
 
 msgid "Search redirects"
-msgstr "Cerca redireccions"
+msgstr "Cercar redireccions"
 
 #, python-format
 msgid "File format of type \"%(extension)s\" is not supported"

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-01-24 13:51+0000\n"
+"POT-Creation-Date: 2024-04-18 17:28+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,7 +22,8 @@ msgstr ""
 msgid "Wagtail redirects"
 msgstr ""
 
-#: filters.py:12 templates/wagtailredirects/list.html:20 views.py:436
+#: filters.py:12 templates/wagtailredirects/list.html:20 views.py:102
+#: views.py:466
 msgid "Type"
 msgstr ""
 
@@ -124,7 +125,7 @@ msgid "redirects"
 msgstr ""
 
 #: templates/wagtailredirects/add.html:3 templates/wagtailredirects/add.html:5
-#: templates/wagtailredirects/index.html:14
+#: views.py:69
 msgid "Add redirect"
 msgstr ""
 
@@ -133,16 +134,14 @@ msgstr ""
 msgid "Save"
 msgstr ""
 
-#: templates/wagtailredirects/choose_import_file.html:3
-#: templates/wagtailredirects/index.html:7
-#: templates/wagtailredirects/index.html:10 wagtail_hooks.py:34
+#: templates/wagtailredirects/choose_import_file.html:3 views.py:78
+#: wagtail_hooks.py:34
 msgid "Redirects"
 msgstr ""
 
 #: templates/wagtailredirects/choose_import_file.html:6
 #: templates/wagtailredirects/confirm_import.html:6
-#: templates/wagtailredirects/import_summary.html:5
-#: templates/wagtailredirects/index.html:17
+#: templates/wagtailredirects/import_summary.html:5 views.py:116
 msgid "Import redirects"
 msgstr ""
 
@@ -218,12 +217,12 @@ msgstr ""
 
 #: templates/wagtailredirects/import_summary.html:17
 #: templates/wagtailredirects/list.html:12
-#: templates/wagtailredirects/list.html:15 views.py:433
+#: templates/wagtailredirects/list.html:15 views.py:84 views.py:463
 msgid "From"
 msgstr ""
 
 #: templates/wagtailredirects/import_summary.html:18
-#: templates/wagtailredirects/list.html:19 views.py:435
+#: templates/wagtailredirects/list.html:19 views.py:96 views.py:465
 msgid "To"
 msgstr ""
 
@@ -235,11 +234,19 @@ msgstr ""
 msgid "Continue"
 msgstr ""
 
-#: templates/wagtailredirects/index.html:18
-msgid "Export redirects"
+#: templates/wagtailredirects/index_results.html:7
+#, python-format
+msgid "Sorry, no redirects match \"<em>%(query_string)s</em>\""
 msgstr ""
 
-#: templates/wagtailredirects/list.html:18 views.py:434
+#: templates/wagtailredirects/index_results.html:13
+#, python-format
+msgid ""
+"No redirects have been created. Why not <a "
+"href=\"%(wagtailredirects_add_redirect_url)s\">add one</a>?"
+msgstr ""
+
+#: templates/wagtailredirects/list.html:18 views.py:90 views.py:464
 msgid "Site"
 msgstr ""
 
@@ -252,78 +259,63 @@ msgstr ""
 msgid "No redirects found."
 msgstr ""
 
-#: templates/wagtailredirects/results.html:5
-#, python-format
-msgid "There is %(counter)s match"
-msgid_plural "There are %(counter)s matches"
-msgstr[0] ""
-msgstr[1] ""
-
-#: templates/wagtailredirects/results.html:18
-#, python-format
-msgid "Sorry, no redirects match \"<em>%(query_string)s</em>\""
-msgstr ""
-
-#: templates/wagtailredirects/results.html:21
-#, python-format
-msgid ""
-"No redirects have been created. Why not <a "
-"href=\"%(wagtailredirects_add_redirect_url)s\">add one</a>?"
+#: views.py:122
+msgid "Export redirects"
 msgstr ""
 
-#: views.py:117
+#: views.py:147
 #, python-format
 msgid "Redirect '%(redirect_title)s' updated."
 msgstr ""
 
-#: views.py:122 views.py:190
+#: views.py:152 views.py:220
 msgid "Edit"
 msgstr ""
 
-#: views.py:128
+#: views.py:158
 msgid "The redirect could not be saved due to errors."
 msgstr ""
 
-#: views.py:160
+#: views.py:190
 #, python-format
 msgid "Redirect '%(redirect_title)s' deleted."
 msgstr ""
 
-#: views.py:185
+#: views.py:215
 #, python-format
 msgid "Redirect '%(redirect_title)s' added."
 msgstr ""
 
-#: views.py:197
+#: views.py:227
 msgid "The redirect could not be created due to errors."
 msgstr ""
 
-#: views.py:236
+#: views.py:266
 msgid "Search redirects"
 msgstr ""
 
-#: views.py:250
+#: views.py:280
 #, python-format
 msgid "File format of type \"%(extension)s\" is not supported"
 msgstr ""
 
-#: views.py:267
+#: views.py:297
 #, python-format
 msgid "Imported file has a wrong encoding: %(error_message)s"
 msgstr ""
 
-#: views.py:274
+#: views.py:304
 #, python-format
 msgid "%(error)s encountered while trying to read file: %(filename)s"
 msgstr ""
 
-#: views.py:365
+#: views.py:395
 #, python-format
 msgid "Imported %(total)d redirect"
 msgid_plural "Imported %(total)d redirects"
 msgstr[0] ""
 msgstr[1] ""
 
-#: views.py:421
+#: views.py:451
 msgid "Export Redirects"
 msgstr ""

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

@@ -6,8 +6,8 @@
 # Axel Haustant, 2016
 # Axel Haustant, 2016
 # Bertrand Bordage <bordage.bertrand@gmail.com>, 2015,2017-2018
-# fpoulain <fpoulain@metrodore.fr>, 2018
-# fpoulain <fpoulain@metrodore.fr>, 2018
+# 69c761fa404d2f74d5a7a2904d9e6f47_dc2dbc9 <f37077798760362881f9d396b6e22ec7_1878>, 2018
+# 69c761fa404d2f74d5a7a2904d9e6f47_dc2dbc9 <f37077798760362881f9d396b6e22ec7_1878>, 2018
 # Léo <leo@naeka.fr>, 2016
 # Loic Teixeira, 2020-2022
 # nahuel, 2014

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

@@ -20,8 +20,8 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he_IL\n"
-"Plural-Forms: nplurals=4; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
-"1 == 0) ? 1: (n % 10 == 0 && n % 1 == 0 && n > 10) ? 2 : 3;\n"
+"Plural-Forms: nplurals=3; plural=(n == 1 && n % 1 == 0) ? 0 : (n == 2 && n % "
+"1 == 0) ? 1: 2;\n"
 
 msgid "Type"
 msgstr "סוג"

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"),