From 1dde5eff8addab7b34e5b363b0f79ab238c56a49 Mon Sep 17 00:00:00 2001 From: winie Date: Mon, 30 Jun 2025 16:11:35 +0200 Subject: [PATCH 1/2] Add view parameter to get_search_terms method of SearchFilter class --- rest_framework/filters.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rest_framework/filters.py b/rest_framework/filters.py index 3f4730da84..5177542f07 100644 --- a/rest_framework/filters.py +++ b/rest_framework/filters.py @@ -80,7 +80,7 @@ def get_search_fields(self, view, request): """ return getattr(view, 'search_fields', None) - def get_search_terms(self, request): + def get_search_terms(self, request, view): """ Search terms are set by a ?search=... query parameter, and may be whitespace delimited. @@ -146,7 +146,7 @@ def must_call_distinct(self, queryset, search_fields): def filter_queryset(self, request, queryset, view): search_fields = self.get_search_fields(view, request) - search_terms = self.get_search_terms(request) + search_terms = self.get_search_terms(request, view) if not search_fields or not search_terms: return queryset From 990d26567bb88f73c84add28132b7bdea2d0061c Mon Sep 17 00:00:00 2001 From: winie Date: Mon, 30 Jun 2025 16:11:44 +0200 Subject: [PATCH 2/2] Add view argument to SearchFilterTests test cases --- tests/test_filters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/test_filters.py b/tests/test_filters.py index 9fc8ad1a9e..0619553c0d 100644 --- a/tests/test_filters.py +++ b/tests/test_filters.py @@ -211,7 +211,7 @@ def test_search_field_with_null_characters(self): request = view.initialize_request(request) with self.assertRaises(ValidationError): - filters.SearchFilter().get_search_terms(request) + filters.SearchFilter().get_search_terms(request, view) def test_search_field_with_custom_lookup(self): class SearchListView(generics.ListAPIView):