.
This commit is contained in:
@@ -450,6 +450,9 @@ class CidUser(models.Model):
|
|||||||
self.save()
|
self.save()
|
||||||
return True, ""
|
return True, ""
|
||||||
|
|
||||||
|
def get_email_details_url(self):
|
||||||
|
return reverse("generic:candidate_email_details", kwargs={"cid": self.cid})
|
||||||
|
|
||||||
def get_email_results_url(self):
|
def get_email_results_url(self):
|
||||||
return reverse("generic:candidate_email_results", kwargs={"cid": self.cid})
|
return reverse("generic:candidate_email_results", kwargs={"cid": self.cid})
|
||||||
|
|
||||||
|
|||||||
@@ -8,7 +8,11 @@
|
|||||||
<ul id="user-list">
|
<ul id="user-list">
|
||||||
{% for user in users %}
|
{% for user in users %}
|
||||||
<li data-email={{user.email}}
|
<li data-email={{user.email}}
|
||||||
|
{% if results %}
|
||||||
data-posturl='{{user.get_email_results_url}}'
|
data-posturl='{{user.get_email_results_url}}'
|
||||||
|
{% else %}
|
||||||
|
data-posturl='{{user.get_email_details_url}}'
|
||||||
|
{% endif %}
|
||||||
>{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
|
>{{user.cid}}/{{user.name}}: {{user.email}} [{{user.supervisor_email}}] </li>
|
||||||
{% endfor %}
|
{% endfor %}
|
||||||
</ul>
|
</ul>
|
||||||
|
|||||||
+2
-2
@@ -1527,7 +1527,7 @@ def group_email(request, pk, resend=False):
|
|||||||
request,
|
request,
|
||||||
"generic/group_emailed.html",
|
"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()},
|
{"users": users, "users_count": users.count(), "results": False},
|
||||||
)
|
)
|
||||||
|
|
||||||
# sent = []
|
# sent = []
|
||||||
@@ -1570,7 +1570,7 @@ def group_email_results(request, pk, resend=False):
|
|||||||
request,
|
request,
|
||||||
"generic/group_emailed.html",
|
"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()},
|
{"users": users, "users_count": users.count(), "results": True},
|
||||||
)
|
)
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user