From 9196cddac324e22462b8d9635e936fa800493635 Mon Sep 17 00:00:00 2001 From: Venelin Stoykov Date: Thu, 9 Jul 2015 15:01:52 +0300 Subject: [PATCH] Allow passing models.Manager to RelatedField.queryset --- rest_framework/relations.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rest_framework/relations.py b/rest_framework/relations.py index c5cbfebcd..de152df98 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -5,6 +5,7 @@ from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist from django.core.urlresolvers import ( NoReverseMatch, Resolver404, get_script_prefix, resolve ) +from django.db import models from django.db.models.query import QuerySet from django.utils import six from django.utils.encoding import smart_text @@ -87,7 +88,7 @@ class RelatedField(Field): def get_queryset(self): queryset = self.queryset - if isinstance(queryset, QuerySet): + if isinstance(queryset, (QuerySet, models.Manager)): # Ensure queryset is re-evaluated whenever used. queryset = queryset.all() return queryset