aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/generics.py
diff options
context:
space:
mode:
authorMark Aaron Shirley2013-04-16 09:55:47 -0700
committerMark Aaron Shirley2013-04-16 09:55:47 -0700
commitc7e000e46e831a254689faac44ea44ebafe3cd61 (patch)
treef3b3ed8c258b82b3dfb1939404f00f5fb16b7c1c /rest_framework/generics.py
parentbda25479aa7e73c90bc77b7c7219eaa411af138e (diff)
parent23289b023db230f73e4a5bfae24a56c79e3fcd4b (diff)
downloaddjango-rest-framework-c7e000e46e831a254689faac44ea44ebafe3cd61.tar.bz2
Merge remote-tracking branch 'upstream/master' into writable-nested-modelserializer
Conflicts: docs/api-guide/serializers.md
Diffstat (limited to 'rest_framework/generics.py')
-rw-r--r--rest_framework/generics.py1
1 files changed, 1 insertions, 0 deletions
diff --git a/rest_framework/generics.py b/rest_framework/generics.py
index 36ecf915..f9133c73 100644
--- a/rest_framework/generics.py
+++ b/rest_framework/generics.py
@@ -130,6 +130,7 @@ class SingleObjectAPIView(SingleObjectMixin, GenericAPIView):
"""
Override default to add support for object-level permissions.
"""
+ queryset = self.filter_queryset(self.get_queryset())
obj = super(SingleObjectAPIView, self).get_object(queryset)
self.check_object_permissions(self.request, obj)
return obj