Merge branch 'master' of github.com:tomchristie/django-rest-framework

Author: tomchristie

rest_framework/utils/serializer_helpers.py

@@ -112,7 +112,7 @@ def as_form_field(self):
             if isinstance(value, (list, dict)):
                 values[key] = value
             else:
-                values[key] = '' if value is None else force_text(value)
+                values[key] = '' if (value is None or value is False) else force_text(value)
         return self.__class__(self._field, values, self.errors, self._prefix)
 
 

tests/test_bound_fields.py

@@ -45,6 +45,16 @@ class ExampleSerializer(serializers.Serializer):
         assert serializer['amount'].errors is None
         assert serializer['amount'].name == 'amount'
 
+    def test_as_form_fields(self):
+        class ExampleSerializer(serializers.Serializer):
+            bool_field = serializers.BooleanField()
+            null_field = serializers.IntegerField(allow_null=True)
+
+        serializer = ExampleSerializer(data={'bool_field': False, 'null_field': None})
+        assert serializer.is_valid()
+        assert serializer['bool_field'].as_form_field().value == ''
+        assert serializer['null_field'].as_form_field().value == ''
+
 
 class TestNestedBoundField:
     def test_nested_empty_bound_field(self):
@@ -67,3 +77,16 @@ class ExampleSerializer(serializers.Serializer):
         assert serializer['nested']['amount'].value is None
         assert serializer['nested']['amount'].errors is None
         assert serializer['nested']['amount'].name == 'nested.amount'
+
+    def test_as_form_fields(self):
+        class Nested(serializers.Serializer):
+            bool_field = serializers.BooleanField()
+            null_field = serializers.IntegerField(allow_null=True)
+
+        class ExampleSerializer(serializers.Serializer):
+            nested = Nested()
+
+        serializer = ExampleSerializer(data={'nested': {'bool_field': False, 'null_field': None}})
+        assert serializer.is_valid()
+        assert serializer['nested']['bool_field'].as_form_field().value == ''
+        assert serializer['nested']['null_field'].as_form_field().value == ''