aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2013-05-15 10:29:51 +0100
committerTom Christie2013-05-15 10:29:51 +0100
commit092d5223eb7ea1bbf9b6bb967200cb3725e02112 (patch)
tree012b2d17fa02b937a7fa509f131fce28071b1945
parent2f54decd3e32497db2d17b1723500f8d764459f6 (diff)
downloaddjango-rest-framework-092d5223eb7ea1bbf9b6bb967200cb3725e02112.tar.bz2
Fix searchfilter issues
-rw-r--r--rest_framework/filters.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 34831dd7..c058bc71 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -74,7 +74,7 @@ class SearchFilter(BaseFilterBackend):
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)
+ params = request.QUERY_PARAMS.get(self.search_param, '')
return params.replace(',', ' ').split()
def construct_search(self, field_name):
@@ -91,7 +91,7 @@ class SearchFilter(BaseFilterBackend):
search_fields = getattr(view, 'search_fields', None)
if not search_fields:
- return None
+ return queryset
orm_lookups = [self.construct_search(str(search_field))
for search_field in search_fields]