diff options
| author | Tom Christie | 2015-01-19 15:16:57 +0000 |
|---|---|---|
| committer | Tom Christie | 2015-01-19 15:16:57 +0000 |
| commit | 6065cdbd939542dec79708615bc3e75b38834f41 (patch) | |
| tree | b7e582185f1383d630dfe7b1fb8dc1e504599164 /rest_framework/relations.py | |
| parent | 4f3c3a06cfc0ea2dfbf46da2d98546664343ce93 (diff) | |
| parent | fdeef89ba79e617ea22dae68a0b42b3f60d67a4d (diff) | |
| download | django-rest-framework-6065cdbd939542dec79708615bc3e75b38834f41.tar.bz2 | |
Merge master
Diffstat (limited to 'rest_framework/relations.py')
| -rw-r--r-- | rest_framework/relations.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/rest_framework/relations.py b/rest_framework/relations.py index 05ac3d1c..a85edfec 100644 --- a/rest_framework/relations.py +++ b/rest_framework/relations.py @@ -7,6 +7,7 @@ from django.utils import six from django.utils.encoding import smart_text from django.utils.six.moves.urllib import parse as urlparse 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.reverse import reverse from rest_framework.utils import html @@ -103,7 +104,7 @@ class RelatedField(Field): @property def choices(self): - return dict([ + return OrderedDict([ ( six.text_type(self.to_representation(item)), six.text_type(item) @@ -364,7 +365,7 @@ class ManyRelatedField(Field): (item, self.child_relation.to_representation(item)) for item in iterable ] - return dict([ + return OrderedDict([ ( six.text_type(item_representation), six.text_type(item) + ' - ' + six.text_type(item_representation) |
