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

Merge 9285aaf99c into 31b585f26a

Browse Source
This commit is contained in:
Marc Tamlyn 2013-01-07 13:13:29 -08:00
commit 3cc044fb12
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
rest_framework/pagination.py
View File

@ -62,7 +62,8 @@ class BasePaginationSerializer(serializers.Serializer):
super(BasePaginationSerializer, self).__init__(*args, **kwargs) super(BasePaginationSerializer, self).__init__(*args, **kwargs)
results_field = self.results_field results_field = self.results_field
object_serializer = self.opts.object_serializer_class object_serializer = self.opts.object_serializer_class
self.fields[results_field] = object_serializer(source='object_list') kwargs['source'] = 'object_list'
self.fields[results_field] = object_serializer(**kwargs)
def to_native(self, obj): def to_native(self, obj):
""" """

3
rest_framework/tests/pagination.py
View File

@ -181,8 +181,7 @@ class UnitTestPagination(TestCase):
""" """
Ensure context gets passed through to the object serializer. Ensure context gets passed through to the object serializer.
""" """
serializer = PassOnContextPaginationSerializer(self.first_page) serializer = PassOnContextPaginationSerializer(self.first_page, context={'foo': 'bar'})
serializer.data
results = serializer.fields[serializer.results_field] results = serializer.fields[serializer.results_field]
self.assertTrue(serializer.context is results.context) self.assertTrue(serializer.context is results.context)