Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Use custom ListSerializer for pagination if one is specified on the s…
…erializer.
  • Loading branch information
lovelydinosaur committed Dec 20, 2014
commit 03c4eb11305dcc9f366cdd008a5985bcf47c13ce
7 changes: 6 additions & 1 deletion rest_framework/pagination.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,12 @@ def __init__(self, *args, **kwargs):
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'
)
Expand Down