Merge pull request #3705 from mcastle/patch-2

tomchristie · tomchristie · commit c227b8188eff · 2015-12-07T10:10:24.000Z
Admin and API browser fails for views without a filter_class
diff --git a/rest_framework/filters.py b/rest_framework/filters.py
@@ -118,10 +118,9 @@ def filter_queryset(self, request, queryset, view):
 
     def to_html(self, request, queryset, view):
         filter_class = self.get_filter_class(view, queryset)
-        if filter_class:
-            filter_instance = filter_class(request.query_params, queryset=queryset)
-        else:
-            filter_instance = None
+        if not filter_class:
+            return None
+        filter_instance = filter_class(request.query_params, queryset=queryset)
         context = {
             'filter': filter_instance
         }
