Merge pull request #3324 from Rikuoja/master

Don't error on missing `search_fields` attribute.
encode · Aug 24, 2015 · 1ba8792 · 1ba8792
2 parents 0198bce + 65df9fd
commit 1ba8792
Showing 1 changed file with 5 additions and 4 deletions.
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -102,15 +102,16 @@ def construct_search(self, field_name):
     def filter_queryset(self, request, queryset, view):
         search_fields = getattr(view, 'search_fields', None)
 
-        orm_lookups = [
-            self.construct_search(six.text_type(search_field))
-            for search_field in search_fields
-        ]
         search_terms = self.get_search_terms(request)
 
         if not search_fields or not search_terms:
             return queryset
 
+        orm_lookups = [
+            self.construct_search(six.text_type(search_field))
+            for search_field in search_fields
+        ]
+
         base = queryset
         for search_term in search_terms:
             queries = [