Skip to content

Commit 38c1558

Browse files
authored
Merge pull request #841 from cecilialau6776/project_review_email
Update new_project_review email
2 parents 425fc12 + 99fcd60 commit 38c1558

File tree

2 files changed

+22
-5
lines changed

2 files changed

+22
-5
lines changed

coldfront/core/project/views.py

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1219,7 +1219,7 @@ def post(self, request, *args, **kwargs):
12191219

12201220
if project_review_form.is_valid():
12211221
form_data = project_review_form.cleaned_data
1222-
ProjectReview.objects.create(
1222+
project_review_obj = ProjectReview.objects.create(
12231223
project=project_obj,
12241224
reason_for_not_updating_project=form_data.get("reason"),
12251225
status=project_review_status_choice,
@@ -1229,13 +1229,21 @@ def post(self, request, *args, **kwargs):
12291229
project_obj.save()
12301230

12311231
domain_url = get_domain_url(self.request)
1232-
url = "{}{}".format(domain_url, reverse("project-review-list"))
1232+
project_review_list_url = "{}{}".format(domain_url, reverse("project-review-list"))
1233+
project_url = "{}{}".format(domain_url, reverse("project-detail", kwargs={"pk": project_obj.pk}))
1234+
1235+
email_context = {
1236+
"project": project_obj,
1237+
"project_url": project_url,
1238+
"project_review": project_review_obj,
1239+
"project_review_list_url": project_review_list_url,
1240+
}
12331241

12341242
if EMAIL_ENABLED:
12351243
send_email_template(
12361244
"New project review has been submitted",
12371245
"email/new_project_review.txt",
1238-
{"url": url},
1246+
email_context,
12391247
EMAIL_SENDER,
12401248
[
12411249
EMAIL_DIRECTOR_EMAIL_ADDRESS,
Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,11 @@
1-
A new project review has been submitted. Please review at your earliest convenience:
2-
{{url}}
1+
A new project review has been submitted for {{project.title}}.
2+
3+
Project information:
4+
Title: {{project.title}} ({{project_url}})
5+
PI: {{project.pi.username}} ({{project.pi.email}})
6+
Latest grant: {{project.latest_grant}}
7+
Latest publication: {{project.latest_publication}}
8+
{% if project_review.reason_for_not_updating_project %}Reason for not updating project: {{project_review.reason_for_not_updating_project}}{% endif %}
9+
10+
Please review at your earliest convenience:
11+
{{project_review_list_url}}#:~:text={{project.title}}

0 commit comments

Comments
 (0)