encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-09 23:04:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/rubendura/django-rest-framework into rubendura-master

Browse Source
This commit is contained in:
Tom Christie 2016-08-10 12:04:35 +01:00
commit 54b5f05676
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
rest_framework/relations.py
View File

@ -156,14 +156,16 @@ class RelatedField(Field):
# Standard case, return the object instance.
return get_attribute(instance, self.source_attrs)
@property
def choices(self):
def get_choices(self, cutoff=None):
queryset = self.get_queryset()
if queryset is None:
# Ensure that field.choices returns something sensible
# even when accessed with a read-only field.
return {}
if cutoff:
queryset = queryset[:cutoff]
return OrderedDict([
(
six.text_type(self.to_representation(item)),
@ -172,13 +174,17 @@ class RelatedField(Field):
for item in queryset
])
@property
def choices(self):
return self.get_choices()
@property
def grouped_choices(self):
return self.choices
def iter_options(self):
return iter_options(
self.grouped_choices,
self.get_choices(self.html_cutoff),
cutoff=self.html_cutoff,
cutoff_text=self.html_cutoff_text
)