encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2024-11-13 05:06:53 +03:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3086 from vstoykov/fix-manyrelated-choices

Browse Source 
Fix ManyRelatedField.choices
This commit is contained in:
Tom Christie 2015-06-29 14:21:47 +01:00
commit 5833a1847f
1 changed files with 1 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rest_framework/relations.py
View File

@ -388,16 +388,4 @@ class ManyRelatedField(Field):
@property @property
def choices(self): def choices(self):
queryset = self.child_relation.queryset return self.child_relation.choices
iterable = queryset.all() if (hasattr(queryset, 'all')) else queryset
items_and_representations = [
(item, self.child_relation.to_representation(item))
for item in iterable
]
return OrderedDict([
(
six.text_type(item_representation),
six.text_type(item) + ' - ' + six.text_type(item_representation)
)
for item, item_representation in items_and_representations
])