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

Merge d7799c32c8 into 836e49b535

Browse Source
This commit is contained in:
jrschneider 2017-06-06 20:17:39 +00:00 committed by GitHub
commit 200584a93a
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

@ -74,7 +74,7 @@ class GenericAPIView(views.APIView):
queryset = queryset.all() queryset = queryset.all()
return queryset return queryset
def get_object(self): def get_object(self, queryset=None):
""" """
Returns the object the view is displaying. Returns the object the view is displaying.
@ -82,7 +82,10 @@ class GenericAPIView(views.APIView):
queryset lookups. Eg if objects are referenced using multiple queryset lookups. Eg if objects are referenced using multiple
keyword arguments in the url conf. 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. # Perform the lookup filtering.
lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field lookup_url_kwarg = self.lookup_url_kwarg or self.lookup_field