upstream/2026.3.1 #14

Merged
simon merged 161 commits from upstream/2026.3.1 into master 2026-04-13 09:11:16 +00:00
Showing only changes of commit f8bbb3d3bb - Show all commits
+2 -2
View File
@@ -503,7 +503,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter):
if cl.include_pending:
headers.append(_('Paid'))
if form_data['secrets']:
if form_data.get('secrets', False):
headers.append(_('Secret'))
headers.append(_('Email'))
@@ -603,7 +603,7 @@ class CSVCheckinList(CheckInListMixin, ListExporter):
]
if cl.include_pending:
row.append(_('Yes') if op.order.status == Order.STATUS_PAID else _('No'))
if form_data['secrets']:
if form_data.get('secrets', False):
row.append(op.secret)
row.append(op.attendee_email or (op.addon_to.attendee_email if op.addon_to else '') or op.order.email or '')
row.append(str(op.order.phone) if op.order.phone else '')