.
This commit is contained in:
+4
-4
@@ -1400,9 +1400,9 @@ def group_email(request, pk, resend=False):
|
|||||||
group = get_object_or_404(CidUserGroup, pk=pk)
|
group = get_object_or_404(CidUserGroup, pk=pk)
|
||||||
|
|
||||||
if resend:
|
if resend:
|
||||||
users = group.ciduser_set.filter()
|
users = group.ciduser_set.filter(active=True)
|
||||||
else:
|
else:
|
||||||
users = group.ciduser_set.filter(login_email_sent=False)
|
users = group.ciduser_set.filter(active=True, login_email_sent=False)
|
||||||
|
|
||||||
sent = []
|
sent = []
|
||||||
not_sent = []
|
not_sent = []
|
||||||
@@ -1425,9 +1425,9 @@ def group_email_results(request, pk, resend=False):
|
|||||||
group = get_object_or_404(CidUserGroup, pk=pk)
|
group = get_object_or_404(CidUserGroup, pk=pk)
|
||||||
|
|
||||||
if resend:
|
if resend:
|
||||||
users = group.ciduser_set.filter(internal_candidate=True)
|
users = group.ciduser_set.filter(active=True, internal_candidate=True)
|
||||||
else:
|
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 = []
|
#sent = []
|
||||||
#not_sent = []
|
#not_sent = []
|
||||||
|
|||||||
Reference in New Issue
Block a user