aboutsummaryrefslogtreecommitdiffstats
path: root/rest_framework/serializers.py
diff options
context:
space:
mode:
authorJosé Padilla2014-12-09 09:25:06 -0400
committerJosé Padilla2014-12-09 09:25:06 -0400
commitafe7ed9333e37384f8ddc57e891da9632c8714c3 (patch)
treec45f1a1242b9c12f4e1e3aaaab2ff6eb90473ed9 /rest_framework/serializers.py
parent0f080bc2932095bc6dd2c71f545f2b588985431d (diff)
downloaddjango-rest-framework-afe7ed9333e37384f8ddc57e891da9632c8714c3.tar.bz2
Add allow_blank for ChoiceField #2184
This makes a ChoiceField optional in HTML if model field has `blank=True` set.
Diffstat (limited to 'rest_framework/serializers.py')
-rw-r--r--rest_framework/serializers.py2
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)