encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-06-18 12:33:20 +03:00
Code Issues Packages Projects Releases Wiki Activity

SearchFilter may be comma and/or whitespace seperated

Browse Source
This commit is contained in:
Tom Christie 2013-05-14 10:10:44 +01:00
parent 752c01420f
commit b2bf5f1f88
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/filters.py
View File

@ -75,7 +75,14 @@ class DjangoFilterBackend(BaseFilterBackend):
class SearchFilter(BaseFilterBackend): class SearchFilter(BaseFilterBackend):
search_param = 'search' # The URL query parameter used for the search. search_param = 'search' # The URL query parameter used for the search.
delimiter = None # For example, set to ',' for comma delimited searchs.
def get_search_terms(self, request):
"""
Search terms are set by a ?search=... query parameter,
and may be comma and/or whitespace delimited.
"""
params = request.QUERY_PARAMS.get(self.search_param)
return params.replace(',', ' ').split()
def construct_search(self, field_name): def construct_search(self, field_name):
if field_name.startswith('^'): if field_name.startswith('^'):
@ -93,11 +100,10 @@ class SearchFilter(BaseFilterBackend):
if not search_fields: if not search_fields:
return None return None
search_terms = request.QUERY_PARAMS.get(self.search_param)
orm_lookups = [self.construct_search(str(search_field)) orm_lookups = [self.construct_search(str(search_field))
for search_field in search_fields] for search_field in search_fields]
for search_term in search_terms.split(self.delimiter): for search_term in self.get_search_terms(request):
or_queries = [models.Q(**{orm_lookup: search_term}) or_queries = [models.Q(**{orm_lookup: search_term})
for orm_lookup in orm_lookups] for orm_lookup in orm_lookups]
queryset = queryset.filter(reduce(operator.or_, or_queries)) queryset = queryset.filter(reduce(operator.or_, or_queries))