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

Show assigned products in list of questions

Browse Source
This commit is contained in:
Raphael Michel
2017-10-17 11:41:29 +02:00
parent 53bb2b2945
commit 6720c0e993
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/pretix/control/templates/pretixcontrol/items/questions.html
View File

@@ -26,11 +26,12 @@
</a> </a>
</p> </p>
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-hover"> <table class="table table-hover table-quotas">
<thead> <thead>
<tr> <tr>
<th>{% trans "Question" %}</th> <th>{% trans "Question" %}</th>
<th>{% trans "Type" %}</th> <th>{% trans "Type" %}</th>
<th>{% trans "Products" %}</th>
<th class="action-col-2"></th> <th class="action-col-2"></th>
<th class="action-col-2"></th> <th class="action-col-2"></th>
</tr> </tr>
@@ -42,6 +43,13 @@
{% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">{{ q.question }}</a></strong> {% url "control:event.items.questions.show" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}">{{ q.question }}</a></strong>
</td> </td>
<td>{{ q.get_type_display }}</td> <td>{{ q.get_type_display }}</td>
<td>
<ul>
{% for item in q.items.all %}
<li><a href="{% url "control:event.item" organizer=request.event.organizer.slug event=request.event.slug item=item.id %}">{{ item.name }}</a></li>
{% endfor %}
</ul>
</td>
<td> <td>
<a href="{% url "control:event.items.questions.up" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a> <a href="{% url "control:event.items.questions.up" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.counter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-up"></i></a>
<a href="{% url "control:event.items.questions.down" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a> <a href="{% url "control:event.items.questions.down" organizer=request.event.organizer.slug event=request.event.slug question=q.id %}" class="btn btn-default btn-sm {% if forloop.revcounter0 == 0 %}disabled{% endif %}"><i class="fa fa-arrow-down"></i></a>

2
src/pretix/control/views/item.py
View File

@@ -250,7 +250,7 @@ class QuestionList(ListView):
template_name = 'pretixcontrol/items/questions.html' template_name = 'pretixcontrol/items/questions.html'
def get_queryset(self): def get_queryset(self):
return self.request.event.questions.all() return self.request.event.questions.prefetch_related('items')
def question_move(request, question, up=True): def question_move(request, question, up=True):