From 15863a6aa15773774122db104579586882ff217b Mon Sep 17 00:00:00 2001 From: smark-1 <75799735+smark-1@users.noreply.github.com> Date: Tue, 10 Sep 2024 19:54:11 -0400 Subject: [PATCH] Fix link to Users search in the "Other searches" bar Regression in b6fdd8c408047a8eaa2f06374b40004f95924cbf --- wagtail/users/tests/test_admin_views.py | 6 ++++++ wagtail/users/views/users.py | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/wagtail/users/tests/test_admin_views.py b/wagtail/users/tests/test_admin_views.py index 4ee93a9ac2..b092da5915 100644 --- a/wagtail/users/tests/test_admin_views.py +++ b/wagtail/users/tests/test_admin_views.py @@ -224,6 +224,12 @@ class TestUserIndexView(AdminTemplateTestUtils, WagtailTestUtils, TestCase): response = self.get({"q": "Hello"}) self.assertEqual(response.status_code, 200) self.assertEqual(response.context["query_string"], "Hello") + soup = self.get_soup(response.content) + filter_options = soup.select(".filter-options a") + self.assertIn( + ("Users", reverse("wagtailusers_users:index") + "?q=Hello"), + [(a.text.strip(), a.get("href")) for a in filter_options], + ) def test_search_query_one_field(self): response = self.get({"q": "first name"}) diff --git a/wagtail/users/views/users.py b/wagtail/users/views/users.py index 0ae2c9af3d..e6ed93aa93 100644 --- a/wagtail/users/views/users.py +++ b/wagtail/users/views/users.py @@ -11,6 +11,7 @@ from django.core.exceptions import FieldDoesNotExist, PermissionDenied from django.db.models import Q from django.forms import CheckboxSelectMultiple from django.template import RequestContext +from django.urls import reverse from django.utils.functional import cached_property from django.utils.translation import gettext as _ from django.utils.translation import gettext_lazy @@ -427,7 +428,7 @@ class UserViewSet(ModelViewSet): def get_search_area(self): return self.search_area_class( gettext_lazy("Users"), - self.get_url_name("index"), + reverse(self.get_url_name("index")), name="users", icon_name="user", order=600,