innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #4630 -- Fixed some validation problems with SplitDateTimeField. Thanks 

glin@seznam.cz and SmileyChris.


git-svn-id: http://code.djangoproject.com/svn/django/trunk@5515 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Malcolm Tredinnick 2007-06-23 03:32:59 +00:00
parent 08aa5c585b
commit dfea6bdfa5
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
django/newforms/fields.py
View File

@ -516,11 +516,13 @@ class MultiValueField(Field):
""" """
clean_data = [] clean_data = []
errors = ErrorList() errors = ErrorList()
if self.required and not value: if not value or isinstance(value, (list, tuple)):
raise ValidationError(gettext(u'This field is required.')) if not value or not [v for v in value if v not in EMPTY_VALUES]:
elif not self.required and not value: if self.required:
return self.compress([]) raise ValidationError(gettext(u'This field is required.'))
if not isinstance(value, (list, tuple)): else:
return self.compress([])
else:
raise ValidationError(gettext(u'Enter a list of values.')) raise ValidationError(gettext(u'Enter a list of values.'))
for i, field in enumerate(self.fields): for i, field in enumerate(self.fields):
try: try:
@ -558,5 +560,11 @@ class SplitDateTimeField(MultiValueField):
def compress(self, data_list): def compress(self, data_list):
if data_list: if data_list:
# Raise a validation error if time or date is empty
# (possible if SplitDateTimeField has required=False).
if data_list[0] in EMPTY_VALUES:
raise ValidationError(gettext(u'Enter a valid date.'))
if data_list[1] in EMPTY_VALUES:
raise ValidationError(gettext(u'Enter a valid time.'))
return datetime.datetime.combine(*data_list) return datetime.datetime.combine(*data_list)
return None return None

16
tests/regressiontests/forms/tests.py
View File

@ -1859,8 +1859,12 @@ ValidationError: [u'Enter a valid date.']
>>> f = SplitDateTimeField(required=False) >>> f = SplitDateTimeField(required=False)
>>> f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)]) >>> f.clean([datetime.date(2006, 1, 10), datetime.time(7, 30)])
datetime.datetime(2006, 1, 10, 7, 30) datetime.datetime(2006, 1, 10, 7, 30)
>>> f.clean(['2006-01-10', '07:30'])
datetime.datetime(2006, 1, 10, 7, 30)
>>> f.clean(None) >>> f.clean(None)
>>> f.clean('') >>> f.clean('')
>>> f.clean([''])
>>> f.clean(['', ''])
>>> f.clean('hello') >>> f.clean('hello')
Traceback (most recent call last): Traceback (most recent call last):
... ...
@ -1877,6 +1881,18 @@ ValidationError: [u'Enter a valid time.']
Traceback (most recent call last): Traceback (most recent call last):
... ...
ValidationError: [u'Enter a valid date.'] ValidationError: [u'Enter a valid date.']
>>> f.clean(['2006-01-10', ''])
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid time.']
>>> f.clean(['2006-01-10'])
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid time.']
>>> f.clean(['', '07:30'])
Traceback (most recent call last):
...
ValidationError: [u'Enter a valid date.']
######### #########
# Forms # # Forms #