Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
D
django-rest-framework
Overview
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
edx
django-rest-framework
Commits
5833a184
Commit
5833a184
authored
Jun 29, 2015
by
Tom Christie
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #3086 from vstoykov/fix-manyrelated-choices
Fix ManyRelatedField.choices
parents
36e4f201
c3c9a712
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 additions
and
13 deletions
+1
-13
rest_framework/relations.py
+1
-13
No files found.
rest_framework/relations.py
View file @
5833a184
...
...
@@ -388,16 +388,4 @@ class ManyRelatedField(Field):
@property
def
choices
(
self
):
queryset
=
self
.
child_relation
.
queryset
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
])
return
self
.
child_relation
.
choices
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment