aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/fields.py
diff options
context:
space:
mode:
authorTom Christie2014-05-20 16:03:51 +0100
committerTom Christie2014-05-20 16:03:51 +0100
commit218b94e60696de649407f9292359e02e5daa787d (patch)
treeec3704334b5ed9436e0a1cc45eb463dd1f6302e0 /rest_framework/fields.py
parentd46d153a9979a96fae643a24286eacaf5c219401 (diff)
parent1e7b5fd2c04e587e30cf29e15ca3074b8d33b92e (diff)
downloaddjango-rest-framework-218b94e60696de649407f9292359e02e5daa787d.tar.bz2
Merge pull request #1536 from Ian-Foote/choicefield_blank_display_value
Allow customising ChoiceField blank display value
Diffstat (limited to 'rest_framework/fields.py')
-rw-r--r--rest_framework/fields.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/rest_framework/fields.py b/rest_framework/fields.py
index d80aab56..2da89550 100644
--- a/rest_framework/fields.py
+++ b/rest_framework/fields.py
@@ -514,12 +514,16 @@ class ChoiceField(WritableField):
'the available choices.'),
}
- def __init__(self, choices=(), *args, **kwargs):
+ def __init__(self, choices=(), blank_display_value=None, *args, **kwargs):
self.empty = kwargs.pop('empty', '')
super(ChoiceField, self).__init__(*args, **kwargs)
self.choices = choices
if not self.required:
- self.choices = BLANK_CHOICE_DASH + self.choices
+ if blank_display_value is None:
+ blank_choice = BLANK_CHOICE_DASH
+ else:
+ blank_choice = [('', blank_display_value)]
+ self.choices = blank_choice + self.choices
def _get_choices(self):
return self._choices