aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Christie2012-12-29 05:25:43 -0800
committerTom Christie2012-12-29 05:25:43 -0800
commit809f5de330deb4b71aaaa93bcdb8ba34b0b2e24d (patch)
tree3b1caaea72eb5f0c212492d5d94835ceefd4348b
parent923f81d26971510c12cb08e3061c7b37c0c6ffe8 (diff)
parentc68f7ca580989a76d335e8a12debd63f85636149 (diff)
downloaddjango-rest-framework-809f5de330deb4b71aaaa93bcdb8ba34b0b2e24d.tar.bz2
Merge pull request #515 from yprez/blank_fields_issue
Fix for #514
-rw-r--r--rest_framework/serializers.py2
-rw-r--r--rest_framework/tests/serializer.py4
2 files changed, 5 insertions, 1 deletions
diff --git a/rest_framework/serializers.py b/rest_framework/serializers.py
index d8350f95..6eb9c3e1 100644
--- a/rest_framework/serializers.py
+++ b/rest_framework/serializers.py
@@ -441,7 +441,7 @@ class ModelSerializer(Serializer):
kwargs['blank'] = model_field.blank
- if model_field.null:
+ if model_field.null or model_field.blank:
kwargs['required'] = False
if model_field.has_default():
diff --git a/rest_framework/tests/serializer.py b/rest_framework/tests/serializer.py
index f780e811..701b2f47 100644
--- a/rest_framework/tests/serializer.py
+++ b/rest_framework/tests/serializer.py
@@ -751,6 +751,10 @@ class BlankFieldTests(TestCase):
serializer = self.not_blank_model_serializer_class(data=self.data)
self.assertEquals(serializer.is_valid(), False)
+ def test_create_model_null_field(self):
+ serializer = self.model_serializer_class(data={})
+ self.assertEquals(serializer.is_valid(), True)
+
#test for issue #460
class SerializerPickleTests(TestCase):