Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ master (unreleased)
- Add/Confirm support of Django REST Framework 3.11 (#417).
- Added a thorough documentation for maintainers
- Pin psycopg2-binary to 2.8 in testing env to fix CI.
- Allow to create validations `IS_DATE_IN_THE_FUTURE` by passing a boolean value instead of a string.

Release 7.0.0 (2021-03-11)
==========================
Expand Down
20 changes: 19 additions & 1 deletion demo/tests/serializers/test_validations.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
from formidable.models import Formidable
from formidable.serializers.validation import (
MinLengthSerializer, RegexpSerializer,
ValidationSerializer
ValidationSerializer, FutureDateSerializer
)


Expand Down Expand Up @@ -58,6 +58,24 @@ def test_invalid_regexp_value(self):
serializer = RegexpSerializer(data=data)
self.assertFalse(serializer.is_valid())

def test_valid_bool_future_date_value(self):
data = {
'field_id': self.text_field.id,
'type': 'IS_DATE_IN_THE_FUTURE',
'value': True,
}
serializer = FutureDateSerializer(data=data)
self.assertTrue(serializer.is_valid())

def test_valid_string_future_date_value(self):
data = {
'field_id': self.text_field.id,
'type': 'IS_DATE_IN_THE_FUTURE',
'value': 'true',
}
serializer = FutureDateSerializer(data=data)
self.assertTrue(serializer.is_valid())

def test_update_validations(self):
list_serializer = ValidationSerializer(many=True)
self.text_field.validations.create(
Expand Down
12 changes: 9 additions & 3 deletions formidable/serializers/validation.py
Original file line number Diff line number Diff line change
Expand Up @@ -128,8 +128,14 @@ class FutureDateSerializer(ValidationSerializer):

type_id = 'IS_DATE_IN_THE_FUTURE'

def to_internal_value(self, data):
if isinstance(data['value'], bool):
data['value'] = str(data['value'])
data = super().to_internal_value(data)
return data

def validate_value(self, value):
if value in ['t', "true"]:
return "true"
if value in ['t', 'true', 'True']:
return 'true'
else:
return "false"
return 'false'