aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2014-12-20 16:42:39 +0000
committerTom Christie2014-12-20 16:42:39 +0000
commite4c7c10b0083ad5da27a494714494283de2f1895 (patch)
tree02c3c61140e13836ee99164ba4515ca199a92927
parentffb8d568e0cf8051fcdc3832143ba6bcc7c16f37 (diff)
parent03c4eb11305dcc9f366cdd008a5985bcf47c13ce (diff)
downloaddjango-rest-framework-e4c7c10b0083ad5da27a494714494283de2f1895.tar.bz2
Merge pull request #2331 from tomchristie/use-custom-list-serializer-for-pagination
Use custom ListSerializer for pagination if required.
-rw-r--r--rest_framework/pagination.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index fb451285..f46b0dfa 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -68,7 +68,12 @@ class BasePaginationSerializer(serializers.Serializer):
except AttributeError:
object_serializer = DefaultObjectSerializer
- self.fields[results_field] = serializers.ListSerializer(
+ try:
+ list_serializer_class = object_serializer.Meta.list_serializer_class
+ except AttributeError:
+ list_serializer_class = serializers.ListSerializer
+
+ self.fields[results_field] = list_serializer_class(
child=object_serializer(),
source='object_list'
)