encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-22 17:47:04 +03:00
Code Issues Packages Projects Releases Wiki Activity

Handle .choices for related fields when queryset argument is actually a mamanger instance. Closes #3145.

Browse Source
This commit is contained in:
Tom Christie 2015-07-14 13:31:24 +01:00
parent 1b51bcdbae
commit c14ad7add7
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
rest_framework/relations.py
View File

@ -5,6 +5,7 @@ from django.core.exceptions import ImproperlyConfigured, ObjectDoesNotExist
from django.core.urlresolvers import ( from django.core.urlresolvers import (
NoReverseMatch, Resolver404, get_script_prefix, resolve NoReverseMatch, Resolver404, get_script_prefix, resolve
) )
from django.db.models import Manager
from django.db.models.query import QuerySet from django.db.models.query import QuerySet
from django.utils import six from django.utils import six
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
@ -87,8 +88,13 @@ class RelatedField(Field):
def get_queryset(self): def get_queryset(self):
queryset = self.queryset queryset = self.queryset
if isinstance(queryset, QuerySet): if isinstance(queryset, (QuerySet, Manager)):
# Ensure queryset is re-evaluated whenever used. # Ensure queryset is re-evaluated whenever used.
# Note that actually a `Manager` class may also be used as the
# queryset argument. This occurs on ModelSerializer fields,
# as it allows us to generate a more expressive 'repr' output
# for the field.
# Eg: 'MyRelationship(queryset=ExampleModel.objects.all())'
queryset = queryset.all() queryset = queryset.all()
return queryset return queryset