encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-02 11:30:12 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge 9ee8ce575b into e4144b5b67

Browse Source
This commit is contained in:
Kyle Fuller 2013-08-02 06:13:48 -07:00
commit 15832d4fdb
2 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
rest_framework/generics.py
View File

@ -92,13 +92,14 @@ class GenericAPIView(views.APIView):
"""
Return a serializer instance to use with paginated data.
"""
class SerializerClass(self.pagination_serializer_class):
class Meta:
object_serializer_class = self.get_serializer_class()
if self.pagination_serializer_class:
class SerializerClass(self.pagination_serializer_class):
class Meta:
object_serializer_class = self.get_serializer_class()
pagination_serializer_class = SerializerClass
context = self.get_serializer_context()
return pagination_serializer_class(instance=page, context=context)
pagination_serializer_class = SerializerClass
context = self.get_serializer_context()
return pagination_serializer_class(instance=page, context=context)
def paginate_queryset(self, queryset, page_size=None):
"""

7
rest_framework/mixins.py
View File

@ -90,8 +90,11 @@ class ListModelMixin(object):
page = self.paginate_queryset(self.object_list)
if page is not None:
serializer = self.get_pagination_serializer(page)
else:
serializer = self.get_serializer(self.object_list, many=True)
if serializer:
return Response(serializer.data)
serializer = self.get_serializer(self.object_list, many=True)
return Response(serializer.data)