formdef: do not abort is_disabled() on wrong date format
This commit is contained in:
parent
995e75d30a
commit
54aa6686f5
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue