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

Changing signature for get_object() within GenericAPIView to match with Django's SingleObjectMixin's signature for get_object() by adding a kwarg for queryset.

Browse Source
This commit is contained in:
disturbedmime 2015-10-03 14:07:36 -07:00
parent 6fb96e93ef
commit d7799c32c8
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rest_framework/generics.py
View File

@ -73,7 +73,7 @@ class GenericAPIView(views.APIView):
queryset = queryset.all()
return queryset
def get_object(self):
def get_object(self, queryset=None):
"""
Returns the object the view is displaying.
@ -81,7 +81,10 @@ class GenericAPIView(views.APIView):
queryset lookups. Eg if objects are referenced using multiple
keyword arguments in the url conf.
"""
queryset = self.filter_queryset(self.get_queryset())
if queryset is not None:
queryset = self.filter_queryset(queryset)
else:
queryset = self.filter_queryset(self.get_queryset())
# Perform the lookup filtering.
lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field