Check-in list exporter: Fix bug if sorting is not set

This commit is contained in:
Raphael Michel
2020-11-19 11:10:11 +01:00
parent 0d0294a292
commit 6c03e49090

View File

@@ -163,7 +163,8 @@ class CheckInListMixin(BaseExporter):
if self.event.has_subevents and not cl.subevent: if self.event.has_subevents and not cl.subevent:
o = ('subevent__date_from', 'subevent__name') o = ('subevent__date_from', 'subevent__name')
if form_data['sort'] == 'name': sort = form_data.get('sort') or 'name'
if sort == 'name':
qs = qs.order_by( qs = qs.order_by(
*o, *o,
Coalesce( Coalesce(
@@ -173,10 +174,10 @@ class CheckInListMixin(BaseExporter):
'order__code' 'order__code'
) )
) )
elif form_data['sort'] == 'code': elif sort == 'code':
qs = qs.order_by(*o, 'order__code') qs = qs.order_by(*o, 'order__code')
elif form_data['sort'].startswith('name:'): elif sort.startswith('name:'):
part = form_data['sort'][5:] part = sort[5:]
qs = qs.annotate( qs = qs.annotate(
resolved_name=Case( resolved_name=Case(
When(attendee_name_cached__ne='', then='attendee_name_parts'), When(attendee_name_cached__ne='', then='attendee_name_parts'),