From 74bc495eb7097cf4787575090c201b8d3b21456e Mon Sep 17 00:00:00 2001 From: Raphael Michel Date: Fri, 9 Aug 2019 12:36:01 +0200 Subject: [PATCH] PDF exporter: Deal with duplicate question answers --- src/pretix/base/pdf.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/pretix/base/pdf.py b/src/pretix/base/pdf.py index 12d2de9b5b..a263d021af 100644 --- a/src/pretix/base/pdf.py +++ b/src/pretix/base/pdf.py @@ -32,7 +32,7 @@ from reportlab.pdfgen.canvas import Canvas from reportlab.platypus import Paragraph from pretix.base.invoice import ThumbnailingImageReader -from pretix.base.models import Order, OrderPosition, QuestionAnswer +from pretix.base.models import Order, OrderPosition from pretix.base.settings import PERSON_NAME_SCHEMES from pretix.base.signals import layout_text_variables from pretix.base.templatetags.money import money_filter @@ -268,10 +268,10 @@ def variables_from_questions(sender, *args, **kwargs): if 'answers' in getattr(op, '_prefetched_objects_cache', {}): a = [a for a in op.answers.all() if a.question_id == question_id][0] else: - a = op.answers.get(question_id=question_id) + a = op.answers.filter(question_id=question_id).first() + if not a: + return "" return str(a).replace("\n", "
\n") - except QuestionAnswer.DoesNotExist: - return "" except IndexError: return ""