From 515ba973c9b3ac46b28ce65913872d726c3c1b78 Mon Sep 17 00:00:00 2001 From: Ross Date: Tue, 8 Feb 2022 10:17:02 +0000 Subject: [PATCH] . --- generic/views.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/generic/views.py b/generic/views.py index 8adfa891..c32ff249 100644 --- a/generic/views.py +++ b/generic/views.py @@ -1400,9 +1400,9 @@ def group_email(request, pk, resend=False): group = get_object_or_404(CidUserGroup, pk=pk) if resend: - users = group.ciduser_set.filter() + users = group.ciduser_set.filter(active=True) else: - users = group.ciduser_set.filter(login_email_sent=False) + users = group.ciduser_set.filter(active=True, login_email_sent=False) sent = [] not_sent = [] @@ -1425,9 +1425,9 @@ def group_email_results(request, pk, resend=False): group = get_object_or_404(CidUserGroup, pk=pk) if resend: - users = group.ciduser_set.filter(internal_candidate=True) + users = group.ciduser_set.filter(active=True, internal_candidate=True) else: - users = group.ciduser_set.filter(internal_candidate=True, results_email_sent=False) + users = group.ciduser_set.filter(active=True, internal_candidate=True, results_email_sent=False) #sent = [] #not_sent = []