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

Sendmail plugins: Fix issues around history of checkin-filtered emails

Browse Source
This commit is contained in:
Raphael Michel
2019-11-20 18:07:45 +01:00
parent bab27f5ab6
commit 485766e247
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/pretix/plugins/sendmail/forms.py
View File

@@ -112,7 +112,6 @@ class MailForm(forms.Form):
'organizer': event.organizer.slug, 'organizer': event.organizer.slug,
}), }),
'data-placeholder': _('Send to customers checked in on list'), 'data-placeholder': _('Send to customers checked in on list'),
'data-inverse-dependency': '#id_not_checked_in'
} }
) )
self.fields['checkin_lists'].widget.choices = self.fields['checkin_lists'].choices self.fields['checkin_lists'].widget.choices = self.fields['checkin_lists'].choices

7
src/pretix/plugins/sendmail/views.py
View File

@@ -54,8 +54,11 @@ class SenderView(EventPermissionRequiredMixin, FormView):
id=logentry.parsed_data['item']['id'] id=logentry.parsed_data['item']['id']
) )
if 'checkin_lists' in logentry.parsed_data: if 'checkin_lists' in logentry.parsed_data:
kwargs['initial']['checkin_lists'] = logentry.parsed_data['checkin_lists'] kwargs['initial']['checkin_lists'] = self.request.event.checkin_lists.filter(
id__in=[c['id'] for c in logentry.parsed_data['checkin_lists']]
)
kwargs['initial']['filter_checkins'] = logentry.parsed_data.get('filter_checkins', False) kwargs['initial']['filter_checkins'] = logentry.parsed_data.get('filter_checkins', False)
kwargs['initial']['not_checked_in'] = logentry.parsed_data.get('not_checked_in', False)
if logentry.parsed_data.get('subevent'): if logentry.parsed_data.get('subevent'):
try: try:
kwargs['initial']['subevent'] = self.request.event.subevents.get( kwargs['initial']['subevent'] = self.request.event.subevents.get(
@@ -204,7 +207,7 @@ class EmailHistoryView(EventPermissionRequiredMixin, ListView):
itemcache[i['id']] for i in log.pdata.get('items', []) itemcache[i['id']] for i in log.pdata.get('items', [])
] ]
log.pdata['checkin_lists'] = [ log.pdata['checkin_lists'] = [
checkin_list_cache[i] for i in log.pdata.get('checkin_lists', []) if i in checkin_list_cache checkin_list_cache[i['id']] for i in log.pdata.get('checkin_lists', []) if i['id'] in checkin_list_cache
] ]
if log.pdata.get('subevent'): if log.pdata.get('subevent'):
try: try: