encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-24 14:14:49 +03:00
Code Issues Packages Projects Releases Wiki Activity

honour default value even when field value not specified

Browse Source
This commit is contained in:
Tom Walker 2013-11-28 15:58:44 +00:00
parent b96404516d
commit 4f7cd6c652
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
rest_framework/serializers.py
View File

@ -323,6 +323,8 @@ class BaseSerializer(WritableField):
field.initialize(parent=self, field_name=field_name)
key = self.get_field_key(field_name)
value = field.field_to_native(obj, field_name)
if value == None and hasattr(field, 'default'):
value = field.default
method = getattr(self, 'transform_%s' % field_name, None)
if callable(method):
value = method(obj, value)

12
rest_framework/tests/test_serializer.py
View File

@ -1722,7 +1722,7 @@ class TestSerializerTransformMethods(TestCase):
)
class DefaultTrueBooleanModel(models.Model):
cat = models.BooleanField(default=True)
dog = models.BooleanField(default=True)
dog = models.BooleanField(default=False)
class SerializerDefaultTrueBoolean(TestCase):
@ -1738,18 +1738,20 @@ class SerializerDefaultTrueBoolean(TestCase):
def test_blank_input(self):
serializer = self.default_true_boolean_serializer()
self.assertEqual(serializer.data['dog'], True)
self.assertEqual(serializer.data['cat'], True)
self.assertEqual(serializer.data['dog'], False)
def test_enabled_as_false(self):
serializer = self.default_true_boolean_serializer({'cat': False, 'dog': False})
self.assertEqual(serializer.data['cat'], False)
self.assertEqual(serializer.data['dog'], False)
def test_enabled_as_true(self):
serializer = self.default_true_boolean_serializer({'cat': True, 'dog': True})
self.assertEqual(serializer.data['cat'], True)
self.assertEqual(serializer.data['dog'], True)
def test_enabled_partial(self):
serializer = self.default_true_boolean_serializer({'cat': False})
self.assertEqual(serializer.data['cat'], False)
self.assertEqual(serializer.data['dog'], False)