Refs #782 -- Reference subevent in check in list selection

This commit is contained in:
Raphael Michel
2018-04-03 17:07:40 +02:00
parent f3e550d003
commit 8564f93706

View File

@@ -136,7 +136,7 @@ def checkinlist_select2(request, **kwargs):
dt_end = make_aware(datetime.combine(dt.date(), time(hour=23, minute=59, second=59)), tz) dt_end = make_aware(datetime.combine(dt.date(), time(hour=23, minute=59, second=59)), tz)
qf |= Q(subevent__date_from__gte=dt_start) & Q(subevent__date_from__lte=dt_end) qf |= Q(subevent__date_from__gte=dt_start) & Q(subevent__date_from__lte=dt_end)
qs = request.event.checkin_lists.filter( qs = request.event.checkin_lists.select_related('subevent').filter(
qf qf
).order_by('name') ).order_by('name')
@@ -148,6 +148,7 @@ def checkinlist_select2(request, **kwargs):
{ {
'id': e.pk, 'id': e.pk,
'text': str(e.name), 'text': str(e.name),
'event': str(e.subevent) if request.event.has_subevents and e.subevent else None,
} }
for e in qs[offset:offset + pagesize] for e in qs[offset:offset + pagesize]
], ],