Merge pull request #83 from rpkilby/fix-all-lookups-mixin

Fix #82, make all lookups work w/ FilterSet mixins

Author: Ryan P Kilby

rest_framework_filters/filterset.py

@@ -38,23 +38,27 @@ def __new__(cls, name, bases, attrs):
 
         new_class = super(FilterSetMetaclass, cls).__new__(cls, name, bases, attrs)
         fix_filter_field = _get_fix_filter_field(new_class)
+        opts = new_class._meta
 
         # order_by is not compatible.
-        if new_class._meta.order_by:
-            new_class._meta.order_by = False
+        if opts.order_by:
+            opts.order_by = False
             warnings.warn(
                 'order_by is no longer supported. Use '
                 'rest_framework.filters.OrderingFilter instead. See: '
                 'https://github.com/philipn/django-rest-framework-filters/issues/72',
                 DeprecationWarning, stacklevel=2
             )
 
+        # If no model is defined, skip all lookups processing
+        if not opts.model:
+            return new_class
+
         # Populate our FilterSet fields with all the possible
         # filters for the AllLookupsFilter field.
         for name, filter_ in six.iteritems(new_class.base_filters.copy()):
             if isinstance(filter_, filters.AllLookupsFilter):
-                model = new_class._meta.model
-                field = filterset.get_model_field(model, filter_.name)
+                field = filterset.get_model_field(opts.model, filter_.name)
 
                 for lookup_expr in utils.lookups_for_field(field):
                     if isinstance(field, ForeignObjectRel):

tests/test_filterset.py

@@ -6,7 +6,7 @@
 
 from django.test import TestCase
 
-from rest_framework_filters import filters
+from rest_framework_filters import FilterSet, filters
 
 from .testapp.models import (
     User, Note, Post, Cover, Page, A, B, C, Person, Tag, BlogPost,
@@ -341,6 +341,22 @@ def test_related_filters_caching(self):
 
         self.assertEqual(len(filters), 1)
 
+    def test_alllookups_filter_with_mixin(self):
+        # Mixin FilterSets should not error when no model is provided. See:
+        # https://github.com/philipn/django-rest-framework-filters/issues/82
+        class Mixin(FilterSet):
+            title = filters.AllLookupsFilter()
+
+        class Actual(Mixin):
+            class Meta:
+                model = Note
+
+        GET = {
+            'title__contains': 'Test',
+        }
+        f = Actual(GET, queryset=Note.objects.all())
+        self.assertEqual(len(list(f)), 4)
+
 
 class GetFilterNameTests(TestCase):