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

Questions: Add SubEvent-Filter; Renew Filter-Form Layout (Z#23168996) (#4538)

Browse Source
This commit is contained in:
Martin Gross
2024-10-21 13:25:18 +02:00
committed by GitHub
parent e49f938eb3
commit 17b2e95569
2 changed files with 50 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/pretix/control/templates/pretixcontrol/items/question.html
View File

@@ -13,8 +13,14 @@
{% trans "Edit question" %} {% trans "Edit question" %}
</a> </a>
</h1> </h1>
<form class="form-inline helper-display-inline" action="" method="get">
<p> <div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">{% trans "Filter" %}</h3>
</div>
<form class="panel-body filter-form" action="" method="get">
<div class="row">
<div class="col-lg-2 col-sm-6 col-xs-6">
<select name="status" class="form-control"> <select name="status" class="form-control">
<option value="" {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option> <option value="" {% if request.GET.status == "" %}selected="selected"{% endif %}>{% trans "All orders" %}</option>
<option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option> <option value="p" {% if request.GET.status == "p" %}selected="selected"{% endif %}>{% trans "Paid" %}</option>
@@ -26,6 +32,8 @@
<option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option> <option value="ne" {% if request.GET.status == "ne" %}selected="selected"{% endif %}>{% trans "Pending or expired" %}</option>
<option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option> <option value="c" {% if request.GET.status == "c" %}selected="selected"{% endif %}>{% trans "Canceled" %}</option>
</select> </select>
</div>
<div class="col-lg-5 col-sm-6 col-xs-6">
<select name="item" class="form-control"> <select name="item" class="form-control">
<option value="">{% trans "All products" %}</option> <option value="">{% trans "All products" %}</option>
{% for item in items %} {% for item in items %}
@@ -35,9 +43,22 @@
</option> </option>
{% endfor %} {% endfor %}
</select> </select>
<button class="btn btn-primary" type="submit">{% trans "Filter" %}</button> </div>
</p> {% if request.event.has_subevents %}
<div class="col-lg-5 col-sm-6 col-xs-6">
{% include "pretixcontrol/event/fragment_subevent_choice_simple.html" %}
</div>
{% endif %}
</div>
<div class="text-right">
<button class="btn btn-primary btn-lg" type="submit">
<span class="fa fa-filter"></span>
{% trans "Filter" %}
</button>
</div>
</form> </form>
</div>
<div class="row" id="question-stats"> <div class="row" id="question-stats">
{% if not stats %} {% if not stats %}
<div class="empty-collection col-md-10 col-xs-12"> <div class="empty-collection col-md-10 col-xs-12">

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

@@ -661,6 +661,10 @@ class QuestionView(EventPermissionRequiredMixin, QuestionMixin, ChartContainingV
question=self.object, orderposition__isnull=False, question=self.object, orderposition__isnull=False,
orderposition__order__event=self.request.event orderposition__order__event=self.request.event
) )
if self.request.GET.get("subevent", "") != "":
qs = qs.filter(orderposition__subevent=self.request.GET["subevent"])
s = self.request.GET.get("status", "np") s = self.request.GET.get("status", "np")
if s != "": if s != "":
if s == 'o': if s == 'o':