diff --git a/rest_framework/filters.py b/rest_framework/filters.py
index 42e77d9108..8d287b1ce2 100644
--- a/rest_framework/filters.py
+++ b/rest_framework/filters.py
@@ -227,8 +227,9 @@ def get_valid_fields(self, queryset, view):
if valid_fields is None:
# Default to allowing filtering on serializer fields
- serializer_class = getattr(view, 'serializer_class')
- if serializer_class is None:
+ try:
+ serializer_class = view.get_serializer_class()
+ except AssertionError:
msg = ("Cannot use %s on a view which does not have either a "
"'serializer_class' or 'ordering_fields' attribute.")
raise ImproperlyConfigured(msg % self.__class__.__name__)
diff --git a/tests/test_filters.py b/tests/test_filters.py
index 729a7b75b0..9809c9bfe0 100644
--- a/tests/test_filters.py
+++ b/tests/test_filters.py
@@ -5,6 +5,7 @@
from decimal import Decimal
from django.conf.urls import url
+from django.core.exceptions import ImproperlyConfigured
from django.core.urlresolvers import reverse
from django.db import models
from django.test import TestCase
@@ -585,6 +586,53 @@ def setUp(self):
)
OrderingFilterModel(title=title, text=text).save()
+ def test_get_valid_fields_from_explicit_serializer_class(self):
+ class OrderingListView(generics.ListAPIView):
+ queryset = OrderingFilterModel.objects.all()
+ serializer_class = OrderingFilterSerializer
+ filter_backends = (filters.OrderingFilter, )
+ ordering_fields = None
+
+ queryset = OrderingFilterModel.objects.all()
+ view = OrderingListView()
+ backend = filters.OrderingFilter()
+ valid_fields = backend.get_valid_fields(queryset, view)
+ expected_valid_fields = [(field.source or field_name, field.label)
+ for (field_name, field) in OrderingFilterSerializer().fields.items()
+ if not getattr(field, 'write_only', False) and not field.source == '*']
+ self.assertEqual(valid_fields, expected_valid_fields)
+
+ def test_get_valid_fields_from_explicit_get_serializer_class(self):
+ class OrderingListView(generics.ListAPIView):
+ queryset = OrderingFilterModel.objects.all()
+ filter_backends = (filters.OrderingFilter,)
+ ordering_fields = None
+
+ def get_serializer_class(self):
+ return OrderingFilterSerializer
+
+ queryset = OrderingFilterModel.objects.all()
+ view = OrderingListView()
+ backend = filters.OrderingFilter()
+ valid_fields = backend.get_valid_fields(queryset, view)
+ expected_valid_fields = [(field.source or field_name, field.label)
+ for (field_name, field) in OrderingFilterSerializer().fields.items()
+ if not getattr(field, 'write_only', False) and not field.source == '*']
+ self.assertEqual(valid_fields, expected_valid_fields)
+
+ def test_improperly_configured_error_from_get_valid_fields(self):
+ class OrderingListView(generics.ListAPIView):
+ queryset = OrderingFilterModel.objects.all()
+ filter_backends = (filters.OrderingFilter,)
+ ordering_fields = None
+ serializer_class = None
+
+ queryset = OrderingFilterModel.objects.all()
+ view = OrderingListView()
+ backend = filters.OrderingFilter()
+ with self.assertRaises(ImproperlyConfigured):
+ backend.get_valid_fields(queryset, view)
+
def test_ordering(self):
class OrderingListView(generics.ListAPIView):
queryset = OrderingFilterModel.objects.all()
pFad - Phonifier reborn
Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.
Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.
Alternative Proxies:
Alternative Proxy
pFad Proxy
pFad v3 Proxy
pFad v4 Proxy