From d166a347fc8d7ad8544edf8c6cd8fd375f9227dd Mon Sep 17 00:00:00 2001 From: Rich Salz Date: Sat, 15 Mar 2025 03:17:57 -0400 Subject: [PATCH 1/3] chore: Add draft name to review-completed email Fixes: #7866 --- ietf/doc/views_review.py | 1 + ietf/templates/review/completed_review.txt | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 1f23c435fa8..2b9017be45e 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -911,6 +911,7 @@ def complete_review(request, name, assignment_id=None, acronym=None): body = render_to_string("review/completed_review.txt", { "assignment": assignment, "content": content, + "draftname": name, }), ) msg.related_groups.add(*related_groups) diff --git a/ietf/templates/review/completed_review.txt b/ietf/templates/review/completed_review.txt index bdbe321ca1f..19f196d2973 100644 --- a/ietf/templates/review/completed_review.txt +++ b/ietf/templates/review/completed_review.txt @@ -1,7 +1,8 @@ {% load ietf_filters %}{% autoescape off %}{% filter maybewordwrap:80 %}{% if assignment.state_id == "part-completed" %} Review is partially done. Another assignment may be needed to complete it. -{% endif %}Reviewer: {{ assignment.reviewer.person }} +{% endif %}Docment: {{ draftname }} +Reviewer: {{ assignment.reviewer.person }} Review result: {{ assignment.result.name }} {{ content }} From b8adee3805a017ba649b5639d7a87c130617cf4f Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sun, 16 Mar 2025 12:37:05 +0700 Subject: [PATCH 2/3] fix: typo --- ietf/templates/review/completed_review.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ietf/templates/review/completed_review.txt b/ietf/templates/review/completed_review.txt index 19f196d2973..c51cab09198 100644 --- a/ietf/templates/review/completed_review.txt +++ b/ietf/templates/review/completed_review.txt @@ -1,7 +1,7 @@ {% load ietf_filters %}{% autoescape off %}{% filter maybewordwrap:80 %}{% if assignment.state_id == "part-completed" %} Review is partially done. Another assignment may be needed to complete it. -{% endif %}Docment: {{ draftname }} +{% endif %}Document: {{ draftname }} Reviewer: {{ assignment.reviewer.person }} Review result: {{ assignment.result.name }} From 25ffdd7081c08ad122487a50cbe7978b66bc1c94 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Sun, 16 Mar 2025 12:55:35 +0700 Subject: [PATCH 3/3] fix: show title and add test --- ietf/doc/tests_review.py | 5 ++++- ietf/doc/views_review.py | 1 - ietf/templates/review/completed_review.txt | 3 ++- 3 files changed, 6 insertions(+), 3 deletions(-) diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py index e93bc021810..13ddbc22ba3 100644 --- a/ietf/doc/tests_review.py +++ b/ietf/doc/tests_review.py @@ -902,7 +902,10 @@ def test_complete_review_enter_content(self): self.assertEqual(len(outbox), 1) self.assertIn(assignment.review_request.team.list_email, outbox[0]["To"]) - self.assertIn("This is a review", get_payload_text(outbox[0])) + payload = get_payload_text(outbox[0]) + self.assertIn("This is a review", payload) + self.assertIn(f"Document: {assignment.review_request.doc.name}", payload) + self.assertIn(f"Title: {assignment.review_request.doc.title}", payload) self.assertIn(settings.MAILING_LIST_ARCHIVE_URL, assignment.review.external_url) diff --git a/ietf/doc/views_review.py b/ietf/doc/views_review.py index 2b9017be45e..1f23c435fa8 100644 --- a/ietf/doc/views_review.py +++ b/ietf/doc/views_review.py @@ -911,7 +911,6 @@ def complete_review(request, name, assignment_id=None, acronym=None): body = render_to_string("review/completed_review.txt", { "assignment": assignment, "content": content, - "draftname": name, }), ) msg.related_groups.add(*related_groups) diff --git a/ietf/templates/review/completed_review.txt b/ietf/templates/review/completed_review.txt index c51cab09198..7d10d8bf130 100644 --- a/ietf/templates/review/completed_review.txt +++ b/ietf/templates/review/completed_review.txt @@ -1,7 +1,8 @@ {% load ietf_filters %}{% autoescape off %}{% filter maybewordwrap:80 %}{% if assignment.state_id == "part-completed" %} Review is partially done. Another assignment may be needed to complete it. -{% endif %}Document: {{ draftname }} +{% endif %}Document: {{ assignment.review_request.doc.name }} +Title: {{ assignment.review_request.doc.title }} Reviewer: {{ assignment.reviewer.person }} Review result: {{ assignment.result.name }}