encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-03 03:50:11 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge c15434e88c into 9c0da46209

Browse Source
This commit is contained in:
Omer Katz 2013-12-12 01:34:07 -08:00
commit eabf9a7852
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
rest_framework/filters.py
View File

@ -41,11 +41,23 @@ class DjangoFilterBackend(BaseFilterBackend):
if filter_class:
filter_model = filter_class.Meta.model
# Haystack SearchQuerySet optional support
try:
from haystack.query import SearchQuerySet
except ImportError:
pass
else:
if isinstance(queryset, SearchQuerySet) and queryset.query.models != [filter_model]:
raise TypeError('The search queryset must be filtered with the FilterSet model %s. Got %s instead' % (filter_model, queryset.query.models))
assert issubclass(filter_model, queryset.model), \
'FilterSet model %s does not match queryset model %s' % \
(filter_model, queryset.model)
# Django QuerySet support
from django.db.models.query import QuerySet
if isinstance(queryset, QuerySet) and not issubclass(filter_model, queryset.model):
raise TypeError('FilterSet model %s does not match queryset model %s' % (filter_model, queryset.model))
# Other queryset-like objects
return filter_class
if filter_fields: