encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-06 21:40:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

Allow ChoiceField to specify defaults directly on class

Browse Source
This commit is contained in:
Damien Nozay 2015-01-04 12:58:58 -08:00
parent 737f663d69
commit ae48939c33
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
rest_framework/fields.py
View File

@ -1005,8 +1005,18 @@ class ChoiceField(Field):
default_error_messages = { default_error_messages = {
'invalid_choice': _('`{input}` is not a valid choice.') 'invalid_choice': _('`{input}` is not a valid choice.')
} }
# allows subclasses to change defaults
allow_blank = False
choices = None
def __init__(self, *args, **kwargs):
if args:
choices = args[0]
else:
choices = kwargs.pop('choices', self.choices)
# not available on class or as kwarg
assert choices is not None, 'need to specify `choices`.'
def __init__(self, choices, **kwargs):
# Allow either single or paired choices style: # Allow either single or paired choices style:
# choices = [1, 2, 3] # choices = [1, 2, 3]
# choices = [(1, 'First'), (2, 'Second'), (3, 'Third')] # choices = [(1, 'First'), (2, 'Second'), (3, 'Third')]
@ -1026,7 +1036,7 @@ class ChoiceField(Field):
(six.text_type(key), key) for key in self.choices.keys() (six.text_type(key), key) for key in self.choices.keys()
]) ])
self.allow_blank = kwargs.pop('allow_blank', False) self.allow_blank = kwargs.pop('allow_blank', self.allow_blank)
super(ChoiceField, self).__init__(**kwargs) super(ChoiceField, self).__init__(**kwargs)