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

Fix bug introduced in PR refactoring

Browse Source
This commit is contained in:
Raphael Michel
2021-06-03 13:28:45 +02:00
parent 64d07a2811
commit 6d9ef397ee
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -58,7 +58,7 @@ from pretix.control.views import CreateView, PaginationMixin, UpdateView
from pretix.plugins.sendmail.tasks import send_mails from pretix.plugins.sendmail.tasks import send_mails
from . import forms from . import forms
from .models import Rule from .models import Rule, ScheduledMail
logger = logging.getLogger('pretix.plugins.sendmail') logger = logging.getLogger('pretix.plugins.sendmail')
@@ -402,14 +402,14 @@ class ListRules(EventPermissionRequiredMixin, PaginationMixin, ListView):
def get_queryset(self): def get_queryset(self):
return self.request.event.sendmail_rules.annotate( return self.request.event.sendmail_rules.annotate(
total_mails=Count('scheduledmail'), total_mails=Count('scheduledmail'),
sent_mails=Count('scheduledmail', filter=Q(scheduledmail__sent=True)), sent_mails=Count('scheduledmail', filter=Q(scheduledmail__state=ScheduledMail.STATE_COMPLETED)),
last_execution=Max( last_execution=Max(
'scheduledmail__computed_datetime', 'scheduledmail__computed_datetime',
filter=Q(scheduledmail__sent=True) filter=Q(scheduledmail__state=ScheduledMail.STATE_COMPLETED)
), ),
next_execution=Min( next_execution=Min(
'scheduledmail__computed_datetime', 'scheduledmail__computed_datetime',
filter=Q(scheduledmail__sent=False) filter=Q(scheduledmail__state=ScheduledMail.STATE_SCHEDULED)
), ),
).prefetch_related( ).prefetch_related(
'limit_products' 'limit_products'