.
This commit is contained in:
+21
-12
@@ -1415,31 +1415,40 @@ def group_email(request, pk, resend=False):
|
||||
)
|
||||
|
||||
|
||||
@login_required
|
||||
@user_is_cid_user_manager
|
||||
def group_email_results(request, pk, resend=False):
|
||||
group = get_object_or_404(CidUserGroup, pk=pk)
|
||||
|
||||
if resend:
|
||||
users = group.ciduser_set.filter()
|
||||
users = group.ciduser_set.filter(internal_candidate=True)
|
||||
else:
|
||||
users = group.ciduser_set.filter(results_email_sent=False)
|
||||
users = group.ciduser_set.filter(internal_candidate=True, results_email_sent=False)
|
||||
|
||||
sent = []
|
||||
not_sent = []
|
||||
for u in users:
|
||||
success, msg = u.email_results(resend=resend)
|
||||
if success:
|
||||
sent.append(u)
|
||||
else:
|
||||
not_sent.append((u, msg))
|
||||
#sent = []
|
||||
#not_sent = []
|
||||
#for u in users:
|
||||
# success, msg = u.email_results(resend=resend)
|
||||
# if success:
|
||||
# sent.append(u)
|
||||
# else:
|
||||
# not_sent.append((u, msg))
|
||||
|
||||
return render(
|
||||
request,
|
||||
"generic/group_emailed.html",
|
||||
{"sent": sent, "not_sent": not_sent, "users_count": users.count()},
|
||||
#{"sent": sent, "not_sent": not_sent, "users_count": users.count()},
|
||||
{"users": users, "users_count": users.count()},
|
||||
)
|
||||
|
||||
@user_is_cid_user_manager
|
||||
def candidate_email_results(request, cid, resend=False):
|
||||
user = CidUser.objects.get(cid=cid)
|
||||
|
||||
email_sent, comment = user.email_results()
|
||||
|
||||
return JsonResponse({"sent": email_sent, "comment": comment})
|
||||
|
||||
|
||||
|
||||
@login_required
|
||||
@user_is_cid_user_manager
|
||||
|
||||
Reference in New Issue
Block a user