mirror of
https://github.com/pretix/pretix.git
synced 2026-05-10 16:04:02 +00:00
Add filter for revoked devices (#2372)
Co-authored-by: Raphael Michel <michel@rami.io>
This commit is contained in:
@@ -2018,6 +2018,15 @@ class DeviceFilterForm(FilterForm):
|
|||||||
],
|
],
|
||||||
required=False,
|
required=False,
|
||||||
)
|
)
|
||||||
|
state = forms.ChoiceField(
|
||||||
|
label=_('Device status'),
|
||||||
|
choices=[
|
||||||
|
('', _('All devices')),
|
||||||
|
('active', _('Active devices')),
|
||||||
|
('revoked', _('Revoked devices'))
|
||||||
|
],
|
||||||
|
required=False
|
||||||
|
)
|
||||||
|
|
||||||
def __init__(self, *args, **kwargs):
|
def __init__(self, *args, **kwargs):
|
||||||
request = kwargs.pop('request')
|
request = kwargs.pop('request')
|
||||||
@@ -2047,6 +2056,11 @@ class DeviceFilterForm(FilterForm):
|
|||||||
if fdata.get('gate'):
|
if fdata.get('gate'):
|
||||||
qs = qs.filter(gate=fdata['gate'])
|
qs = qs.filter(gate=fdata['gate'])
|
||||||
|
|
||||||
|
if fdata.get('state') == 'active':
|
||||||
|
qs = qs.filter(revoked=False)
|
||||||
|
elif fdata.get('state') == 'revoked':
|
||||||
|
qs = qs.filter(revoked=True)
|
||||||
|
|
||||||
if fdata.get('ordering'):
|
if fdata.get('ordering'):
|
||||||
qs = qs.order_by(self.get_order_by())
|
qs = qs.order_by(self.get_order_by())
|
||||||
else:
|
else:
|
||||||
|
|||||||
@@ -30,7 +30,7 @@
|
|||||||
</div>
|
</div>
|
||||||
<form class="panel-body filter-form" action="" method="get">
|
<form class="panel-body filter-form" action="" method="get">
|
||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-6 col-sm-6 col-xs-12">
|
<div class="col-md-4 col-sm-6 col-xs-12">
|
||||||
{% bootstrap_field filter_form.query %}
|
{% bootstrap_field filter_form.query %}
|
||||||
</div>
|
</div>
|
||||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||||
@@ -39,6 +39,9 @@
|
|||||||
<div class="col-md-3 col-sm-6 col-xs-12">
|
<div class="col-md-3 col-sm-6 col-xs-12">
|
||||||
{% bootstrap_field filter_form.software_brand %}
|
{% bootstrap_field filter_form.software_brand %}
|
||||||
</div>
|
</div>
|
||||||
|
<div class="col-md-2 col-sm-6 col-xs-12">
|
||||||
|
{% bootstrap_field filter_form.state %}
|
||||||
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div class="text-right">
|
<div class="text-right">
|
||||||
<button class="btn btn-primary btn-lg" type="submit">
|
<button class="btn btn-primary btn-lg" type="submit">
|
||||||
|
|||||||
Reference in New Issue
Block a user