CGM_Public/pretix_cgo
1
0
Fork 0
forked from CGM_Public/pretix_original
Code Pull Requests Actions Activity

Fix issue in question answer formatting

Browse Source
This commit is contained in:
Raphael Michel
2018-02-02 14:44:05 +01:00
parent 3bfa8bd81e
commit 7ea79ebe56
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
src/pretix/base/models/orders.py
View File

@@ -507,17 +507,26 @@ class QuestionAnswer(models.Model):
elif self.question.type == Question.TYPE_FILE: elif self.question.type == Question.TYPE_FILE:
return str(_("<file>")) return str(_("<file>"))
elif self.question.type == Question.TYPE_DATETIME and self.answer: elif self.question.type == Question.TYPE_DATETIME and self.answer:
d = dateutil.parser.parse(self.answer) try:
if self.orderposition: d = dateutil.parser.parse(self.answer)
tz = pytz.timezone(self.orderposition.order.event.settings.timezone) if self.orderposition:
d = d.astimezone(tz) tz = pytz.timezone(self.orderposition.order.event.settings.timezone)
return date_format(d, "SHORT_DATETIME_FORMAT") d = d.astimezone(tz)
return date_format(d, "SHORT_DATETIME_FORMAT")
except ValueError:
return self.answer
elif self.question.type == Question.TYPE_DATE and self.answer: elif self.question.type == Question.TYPE_DATE and self.answer:
d = dateutil.parser.parse(self.answer) try:
return date_format(d, "SHORT_DATE_FORMAT") d = dateutil.parser.parse(self.answer)
return date_format(d, "SHORT_DATE_FORMAT")
except ValueError:
return self.answer
elif self.question.type == Question.TYPE_TIME and self.answer: elif self.question.type == Question.TYPE_TIME and self.answer:
d = dateutil.parser.parse(self.answer) try:
return date_format(d, "TIME_FORMAT") d = dateutil.parser.parse(self.answer)
return date_format(d, "TIME_FORMAT")
except ValueError:
return self.answer
else: else:
return self.answer return self.answer