From 7ea79ebe5678f2b7eb988b7bfe1b08200e907c09 Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 2 Feb 2018 14:44:05 +0100 Subject: [PATCH] Fix issue in question answer formatting --- src/pretix/base/models/orders.py | 27 ++++++++++++++++++--------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/pretix/base/models/orders.py b/src/pretix/base/models/orders.py index 3d5c5b1c13..9ca28d97a2 100644 --- a/src/pretix/base/models/orders.py +++ b/src/pretix/base/models/orders.py @@ -507,17 +507,26 @@ class QuestionAnswer(models.Model): elif self.question.type == Question.TYPE_FILE: return str(_("")) elif self.question.type == Question.TYPE_DATETIME and self.answer: - d = dateutil.parser.parse(self.answer) - if self.orderposition: - tz = pytz.timezone(self.orderposition.order.event.settings.timezone) - d = d.astimezone(tz) - return date_format(d, "SHORT_DATETIME_FORMAT") + try: + d = dateutil.parser.parse(self.answer) + if self.orderposition: + tz = pytz.timezone(self.orderposition.order.event.settings.timezone) + 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: - d = dateutil.parser.parse(self.answer) - return date_format(d, "SHORT_DATE_FORMAT") + try: + 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: - d = dateutil.parser.parse(self.answer) - return date_format(d, "TIME_FORMAT") + try: + d = dateutil.parser.parse(self.answer) + return date_format(d, "TIME_FORMAT") + except ValueError: + return self.answer else: return self.answer