diff options
| author | Tom Christie | 2014-12-09 14:08:45 +0000 |
|---|---|---|
| committer | Tom Christie | 2014-12-09 14:08:45 +0000 |
| commit | 54a18a4ddb69bb43c13e45f151b075564dd771b2 (patch) | |
| tree | c392eb5c1afba4dee29d67c2e67411b957371bdf /rest_framework/serializers.py | |
| parent | cae19f8924c598cea93a546138757ff48eed9f75 (diff) | |
| parent | afe7ed9333e37384f8ddc57e891da9632c8714c3 (diff) | |
| download | django-rest-framework-54a18a4ddb69bb43c13e45f151b075564dd771b2.tar.bz2 | |
Merge pull request #2239 from jpadilla/allow-blank-choicefield
Add allow_blank for ChoiceField #2184
Diffstat (limited to 'rest_framework/serializers.py')
| -rw-r--r-- | rest_framework/serializers.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py index fb6c826b..b0c0efa7 100644 --- a/rest_framework/serializers.py +++ b/rest_framework/serializers.py @@ -942,7 +942,7 @@ class ModelSerializer(Serializer): # `ModelField`, which is used when no other typed field # matched to the model field. kwargs.pop('model_field', None) - if not issubclass(field_cls, CharField): + if not issubclass(field_cls, CharField) and not issubclass(field_cls, ChoiceField): # `allow_blank` is only valid for textual fields. kwargs.pop('allow_blank', None) |