diff options
| author | Tom Christie | 2013-11-06 04:24:59 -0800 |
|---|---|---|
| committer | Tom Christie | 2013-11-06 04:24:59 -0800 |
| commit | 97430c0d9c608728eb7dc135b9aac4d5327b9247 (patch) | |
| tree | edf528c29d0b58743e7b3450c06511e5d50de294 /rest_framework/serializers.py | |
| parent | 003b9dda342e1fbb9b482a3103599e62cc458911 (diff) | |
| parent | 5829eb7a5b0d45fe668d7ce1ad394a7b5966c70d (diff) | |
| download | django-rest-framework-97430c0d9c608728eb7dc135b9aac4d5327b9247.tar.bz2 | |
Merge pull request #1214 from diox/choicefield-typed
Improve handling of 'empty' values for ChoiceField
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index 4210d058..5240dbf6 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -794,6 +794,8 @@ class ModelSerializer(Serializer): # TODO: TypedChoiceField? if model_field.flatchoices: # This ModelField contains choices kwargs['choices'] = model_field.flatchoices + if model_field.null: + kwargs['empty'] = None return ChoiceField(**kwargs) # put this below the ChoiceField because min_value isn't a valid initializer |