Merge pull request #195 from novafloss/fix-serializer-blank-description

Fix serializer blank description

Author: mgu

CHANGELOG.rst

@@ -5,7 +5,7 @@ ChangeLog
 master (unreleased)
 ===================
 
-- Nothing here yet
+- Fix: Serializers don't allow empty (blank) description on Field and Item (#194).
 
 Release 0.8.0 (2016-03-06)
 ==========================

demo/tests/test_end_point.py

@@ -453,6 +453,21 @@ class CreateSerializerTestCase(TestCase):
         }
     ]
 
+    fields_with_items_empty_description = [
+        {
+            'type_id': 'dropdown',
+            'slug': 'dropdown-input', 'label': 'dropdown label',
+            'multiple': False, 'items': [
+                {'value': 'tutu', 'label': 'toto', 'description': ''},
+                {'value': 'tata', 'label': 'plop'},
+            ],
+            'description': '',
+            'accesses': [{
+                'access_id': 'padawan', 'level': 'REQUIRED'
+            }]
+        }
+    ]
+
     fields_with_validation = [
         {
             'slug': 'text_input',
@@ -751,6 +766,22 @@ def test_create_field_with_items(self):
         )
         self.assertEquals(field.accesses.count(), 5)
 
+    def test_create_empty_description(self):
+        data = copy.deepcopy(self.data)
+        data['fields'] = self.fields_with_items_empty_description
+        serializer = FormidableSerializer(data=data)
+        self.assertTrue(serializer.is_valid(), serializer.errors)
+        instance = serializer.save()
+        self.assertEquals(instance.label, 'test_create')
+        self.assertEquals(instance.description, 'description create')
+        self.assertEquals(instance.fields.count(), 1)
+        field = instance.fields.first()
+        self.assertEquals(field.slug, 'dropdown-input')
+        self.assertEquals(field.help_text, '')
+        self.assertEquals(field.items.count(), 2)
+        item = field.items.first()
+        self.assertEquals(item.help_text, '')
+
     def test_create_field_without_items(self):
         data = copy.deepcopy(self.data)
         fields = copy.deepcopy(self.fields_with_items)

formidable/serializers/fields.py

@@ -68,7 +68,7 @@ class FieldSerializer(WithNestedSerializer):
     order = serializers.IntegerField(write_only=True, required=False)
     defaults = DefaultSerializer(many=True, required=False)
     description = serializers.CharField(required=False, allow_null=True,
-                                        source='help_text')
+                                        allow_blank=True, source='help_text')
 
     nested_objects = ['accesses', 'validations', 'defaults']
 
@@ -136,7 +136,7 @@ class ContextFieldSerializer(serializers.ModelSerializer):
     items = ItemSerializer(many=True, required=False)
     defaults = DefaultSerializer(many=True, required=False)
     description = serializers.CharField(required=False, allow_null=True,
-                                        source='help_text')
+                                        allow_blank=True, source='help_text')
 
     class Meta:
         list_serializer_class = ListContextFieldSerializer

formidable/serializers/items.py

@@ -23,7 +23,7 @@ def validate(self, data):
 class ItemSerializer(serializers.ModelSerializer):
 
     description = serializers.CharField(required=False, allow_null=True,
-                                        source='help_text')
+                                        allow_blank=True, source='help_text')
 
     def to_internal_value(self, data):
         # XXX FIX ME: temporary fix