aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichał Jaworski2014-09-03 16:52:41 +0200
committerMichał Jaworski2014-09-03 16:52:41 +0200
commit9195ccb97f608a48e39a277705fb197fe8c0d50c (patch)
tree8ae1cfd932f3e921fdeaa6225ddea238447ec4ff
parentdeb19272b72f46c31f09651470a91ca46bb7dd2d (diff)
downloaddjango-rest-framework-9195ccb97f608a48e39a277705fb197fe8c0d50c.tar.bz2
Use explicit many=True for object_serializer instantiation in PaginationSerializer and add catch dummy 'many' kwarg on DefaultObjectSerializer
-rw-r--r--rest_framework/pagination.py10
1 files changed, 7 insertions, 3 deletions
diff --git a/rest_framework/pagination.py b/rest_framework/pagination.py
index d51ea929..9dce05b1 100644
--- a/rest_framework/pagination.py
+++ b/rest_framework/pagination.py
@@ -43,8 +43,9 @@ class DefaultObjectSerializer(serializers.Field):
as the default.
"""
- def __init__(self, source=None, context=None):
- # Note: Swallow context kwarg - only required for eg. ModelSerializer.
+ def __init__(self, source=None, many=None, context=None):
+ # Note: Swallow context and many kwargs - only required for
+ # eg. ModelSerializer.
super(DefaultObjectSerializer, self).__init__(source=source)
@@ -82,7 +83,10 @@ class BasePaginationSerializer(serializers.Serializer):
else:
context_kwarg = {}
- self.fields[results_field] = object_serializer(source='object_list', **context_kwarg)
+ print object_serializer
+ self.fields[results_field] = object_serializer(source='object_list',
+ many=True,
+ **context_kwarg)
class PaginationSerializer(BasePaginationSerializer):