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

Device list: Hide revoked devices by default (#2996)

Browse Source
This commit is contained in:
Raphael Michel
2023-01-12 13:35:43 +01:00
committed by GitHub
parent 7a69e00d39
commit 3443296a28
2 changed files with 11 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pretix/control/forms/filter.py
View File

@@ -2264,7 +2264,7 @@ class DeviceFilterForm(FilterForm):
state = forms.ChoiceField( state = forms.ChoiceField(
label=_('Device status'), label=_('Device status'),
choices=[ choices=[
('', _('All devices')), ('all', _('All devices')),
('active', _('Active devices')), ('active', _('Active devices')),
('revoked', _('Revoked devices')) ('revoked', _('Revoked devices'))
], ],

13
src/pretix/control/views/organizer.py
View File

@@ -859,12 +859,19 @@ class DeviceQueryMixin:
@cached_property @cached_property
def request_data(self): def request_data(self):
if self.request.method == "POST": if self.request.method == "POST":
return self.request.POST d = self.request.POST
return self.request.GET else:
d = self.request.GET
d = d.copy()
d.setdefault('state', 'active')
return d
@cached_property @cached_property
def filter_form(self): def filter_form(self):
return DeviceFilterForm(data=self.request_data, request=self.request) return DeviceFilterForm(
data=self.request_data,
request=self.request,
)
def get_queryset(self): def get_queryset(self):
qs = self.request.organizer.devices.prefetch_related( qs = self.request.organizer.devices.prefetch_related(