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

Preserve ordering on relationship drop-down choices. Closes #2408.

Browse Source
This commit is contained in:
Tom Christie 2015-01-14 12:56:03 +00:00
parent 41e13d73fa
commit 4ce4132e08
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
rest_framework/relations.py
View File

@ -7,6 +7,7 @@ from django.utils import six
from django.utils.encoding import smart_text from django.utils.encoding import smart_text
from django.utils.six.moves.urllib import parse as urlparse from django.utils.six.moves.urllib import parse as urlparse
from django.utils.translation import ugettext_lazy as _ from django.utils.translation import ugettext_lazy as _
from rest_framework.compat import OrderedDict
from rest_framework.fields import get_attribute, empty, Field from rest_framework.fields import get_attribute, empty, Field
from rest_framework.reverse import reverse from rest_framework.reverse import reverse
from rest_framework.utils import html from rest_framework.utils import html
@ -103,7 +104,7 @@ class RelatedField(Field):
@property @property
def choices(self): def choices(self):
return dict([ return OrderedDict([
( (
six.text_type(self.to_representation(item)), six.text_type(self.to_representation(item)),
six.text_type(item) six.text_type(item)
@ -364,7 +365,7 @@ class ManyRelatedField(Field):
(item, self.child_relation.to_representation(item)) (item, self.child_relation.to_representation(item))
for item in iterable for item in iterable
] ]
return dict([ return OrderedDict([
( (
six.text_type(item_representation), six.text_type(item_representation),
six.text_type(item) + ' - ' + six.text_type(item_representation) six.text_type(item) + ' - ' + six.text_type(item_representation)