formdef: do not abort is_disabled() on wrong date format

This commit is contained in:
Frédéric Péters 2013-06-13 09:14:30 +02:00
parent 995e75d30a
commit 54aa6686f5
1 changed files with 8 additions and 2 deletions

View File

@ -640,11 +640,17 @@ class FormDef(StorableObject):
if self.disabled:
return True
if self.publication_date:
publication_datetime = datetime.datetime.strptime(self.publication_date, date_format())
try:
publication_datetime = datetime.datetime.strptime(self.publication_date, date_format())
except ValueError:
return False
if publication_datetime > datetime.datetime.now():
return True
if self.expiration_date:
expiration_datetime = datetime.datetime.strptime(self.expiration_date, date_format())
try:
expiration_datetime = datetime.datetime.strptime(self.expiration_date, date_format())
except ValueError:
return False
if expiration_datetime < datetime.datetime.now():
return True
return False