mirror of
https://github.com/pretix/pretix.git
synced 2026-10-02 19:24:42 +00:00
Fix order detail page
This commit is contained in:
@@ -621,35 +621,35 @@
|
||||
{% endif %}
|
||||
</dt>
|
||||
<dd>
|
||||
{#
|
||||
{% if q.answer %}
|
||||
{% if q.answer.file %}
|
||||
<span class="fa fa-file"></span>
|
||||
<a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
|
||||
{{ q.answer.file_name }}
|
||||
</a>
|
||||
<span class="label label-danger" data-toggle="tooltip"
|
||||
title="{% trans "This file has been uploaded by a user and could contain viruses or other malicious content." %}">
|
||||
{% trans "UNSAFE" %}
|
||||
</span>
|
||||
{% if q.answer.is_image %}
|
||||
<br>
|
||||
<a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}" data-lightbox="order"
|
||||
class="answer-thumb">
|
||||
<img src="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">
|
||||
</a>
|
||||
{% endif %}
|
||||
{% elif q.type == "M" %}
|
||||
{{ q.answer.to_string_i18n|rich_text_snippet }}
|
||||
{% elif q.type %}
|
||||
{{ q.answer.to_string_i18n|linebreaksbr }}
|
||||
{% else %}<!-- TODO(questionnaires): proper separation of QuestionAnswer objects and system answers...... -->
|
||||
{{ q.answer|linebreaksbr }}
|
||||
{% endif %}
|
||||
{% else %}
|
||||
<em>{% trans "not answered" %}</em>
|
||||
{% endif %}
|
||||
#}
|
||||
|
||||
{# {% if q.answer %}#}
|
||||
{# {% if q.answer.file %}#}
|
||||
{# <span class="fa fa-file"></span>#}
|
||||
{# <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">#}
|
||||
{# {{ q.answer.file_name }}#}
|
||||
{# </a>#}
|
||||
{# <span class="label label-danger" data-toggle="tooltip"#}
|
||||
{# title="{% trans "This file has been uploaded by a user and could contain viruses or other malicious content." %}">#}
|
||||
{# {% trans "UNSAFE" %}#}
|
||||
{# </span>#}
|
||||
{# {% if q.answer.is_image %}#}
|
||||
{# <br>#}
|
||||
{# <a href="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}" data-lightbox="order"#}
|
||||
{# class="answer-thumb">#}
|
||||
{# <img src="{{ q.answer.backend_file_url }}?token={% answer_token request q.answer %}">#}
|
||||
{# </a>#}
|
||||
{# {% endif %}#}
|
||||
{# {% elif q.type == "M" %}#}
|
||||
{# {{ q.answer.to_string_i18n|rich_text_snippet }}#}
|
||||
{# {% elif q.type %}#}
|
||||
{# {{ q.answer.to_string_i18n|linebreaksbr }}#}
|
||||
{# {% else %}<!-- TODO(questionnaires): proper separation of QuestionAnswer objects and system answers...... -->#}
|
||||
{# {{ q.answer|linebreaksbr }}#}
|
||||
{# {% endif %}#}
|
||||
{# {% else %}#}
|
||||
{# <em>{% trans "not answered" %}</em>#}
|
||||
{# {% endif %}#}
|
||||
|
||||
{% include "pretixcontrol/order/fragment_question_answer.html" with request=request question=q answer=q.answer %}
|
||||
{% if q.system_datafield == "attendee_email" and not line.addon_to %}
|
||||
<form class="form-inline helper-display-inline" method="post"
|
||||
|
||||
@@ -600,7 +600,7 @@ class OrderDetail(OrderView):
|
||||
'item', 'variation', 'addon_to', 'tax_rule', 'used_membership', 'used_membership__membership_type',
|
||||
'discount',
|
||||
).prefetch_related(
|
||||
'item__questions', 'issued_gift_cards', 'owned_gift_cards', 'linked_media', # TODO(questionnaires) : item__questions gibts nicht mehr
|
||||
'item__questionnaires', 'issued_gift_cards', 'owned_gift_cards', 'linked_media', # TODO(questionnaires) : item__questions gibts nicht mehr
|
||||
Prefetch('answers', queryset=QuestionAnswer.objects.prefetch_related('options').select_related('question')),
|
||||
Prefetch('all_checkins', queryset=Checkin.all.select_related('list', 'gate').order_by('datetime')),
|
||||
Prefetch('print_logs', queryset=PrintLog.objects.select_related('device').order_by('datetime')),
|
||||
@@ -624,7 +624,7 @@ class OrderDetail(OrderView):
|
||||
p.additional_fields or
|
||||
(p.item.ask_attendee_data and self.request.event.settings.attendee_names_asked) or
|
||||
(p.item.ask_attendee_data and self.request.event.settings.attendee_emails_asked) or
|
||||
p.item.questions.all()
|
||||
p.item.questionnaires.all()
|
||||
)
|
||||
p.cache_answers()
|
||||
p.order = self.order
|
||||
|
||||
Reference in New Issue
Block a user