Merge pull request #1250 from Ian-Foote/choice_field

Add choices to options metadata for ChoiceField.

1 files changed, 5 insertions, 0 deletions

diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index 463d296f..5a4f04a5 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -514,6 +514,11 @@ class ChoiceField(WritableField):
 
     choices = property(_get_choices, _set_choices)
 
+    def metadata(self):
+        data = super(ChoiceField, self).metadata()
+        data['choices'] = [{'value': v, 'display_name': n} for v, n in self.choices]
+        return data
+
     def validate(self, value):
         """
         Validates that the input is in self.choices.