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

PDF exporter: Deal with duplicate question answers

Browse Source
This commit is contained in:
Raphael Michel
2019-08-09 12:36:01 +02:00
parent b0b0f7474d
commit 74bc495eb7
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/pretix/base/pdf.py
View File

@@ -32,7 +32,7 @@ from reportlab.pdfgen.canvas import Canvas
from reportlab.platypus import Paragraph from reportlab.platypus import Paragraph
from pretix.base.invoice import ThumbnailingImageReader 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.settings import PERSON_NAME_SCHEMES
from pretix.base.signals import layout_text_variables from pretix.base.signals import layout_text_variables
from pretix.base.templatetags.money import money_filter 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', {}): if 'answers' in getattr(op, '_prefetched_objects_cache', {}):
a = [a for a in op.answers.all() if a.question_id == question_id][0] a = [a for a in op.answers.all() if a.question_id == question_id][0]
else: 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", "<br/>\n") return str(a).replace("\n", "<br/>\n")
except QuestionAnswer.DoesNotExist:
return ""
except IndexError: except IndexError:
return "" return ""