From ee7997987d6784c8f047d4efc5f400f42df5699c Mon Sep 17 00:00:00 2001 From: Dmitriy Narkevich Date: Thu, 25 Apr 2013 16:48:41 +0400 Subject: [PATCH] Call get_queryset() only if queryset is not defined in get_object args. --- rest_framework/generics.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/generics.py b/rest_framework/generics.py index f9133c735..c59183210 100644 --- a/rest_framework/generics.py +++ b/rest_framework/generics.py @@ -130,7 +130,8 @@ class SingleObjectAPIView(SingleObjectMixin, GenericAPIView): """ Override default to add support for object-level permissions. """ - queryset = self.filter_queryset(self.get_queryset()) + if queryset is None: + queryset = self.filter_queryset(self.get_queryset()) obj = super(SingleObjectAPIView, self).get_object(queryset) self.check_object_permissions(self.request, obj) return obj