Merged in [17062] from rjsparks@nostrum.com:

Change the default template for assigned review emails to name the assigned reviewer. Fixes #2830.
 - Legacy-Id: 17073
Note: SVN reference [17062] has been migrated to Git commit 38e73b6f89

ietf/dbtemplate/migrations/0007_adjust_review_assigned.py

@@ -0,0 +1,38 @@
+# Copyright The IETF Trust 2019, All Rights Reserved
+# -*- coding: utf-8 -*-
+# Generated by Django 1.11.26 on 2019-11-19 11:47
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+def forward(apps, schema_editor):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    qs = DBTemplate.objects.filter(path='/group/defaults/email/review_assigned.txt')
+    qs.update(content="""{{ assigner.ascii }} has assigned {{ reviewer.person.ascii }} as a reviewer for this document.
+
+{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}
+- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  
+{% endfor %}
+""")
+    qs.update(title="Default template for review assignment email")
+
+def reverse(apps, schema_editor):
+    DBTemplate = apps.get_model('dbtemplate','DBTemplate')
+    qs = DBTemplate.objects.filter(path='/group/defaults/email/review_assigned.txt')
+    qs.update(content="""{{ assigner.ascii }} has assigned you as a reviewer for this document.
+
+{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}
+- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  
+{% endfor %}
+""")
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('dbtemplate', '0006_add_review_assigned_template'),
+    ]
+
+    operations = [
+        migrations.RunPython(forward, reverse)
+    ]

ietf/doc/tests_review.py

@@ -430,7 +430,7 @@ class ReviewTests(TestCase):
         self.assertEqual(len(outbox), 1)
         self.assertEqual('"Some Reviewer" <reviewer@example.com>', outbox[0]["To"])
         message = outbox[0].get_payload(decode=True).decode("utf-8")
-        self.assertIn("{} has assigned you".format(secretary.person.ascii), message)
+        self.assertIn("{} has assigned {}".format(secretary.person.ascii, reviewer.person.ascii), message)
         self.assertIn("This team has completed other reviews", message)
         self.assertIn("{} -01 Serious Issues".format(reviewer_email.person.ascii), message)
 

ietf/review/utils.py

@@ -468,7 +468,7 @@ def assign_review_request_to_reviewer(request, review_req, reviewer, add_skip=Fa
     except DBTemplate.DoesNotExist:
         template = DBTemplate.objects.get(path="/group/defaults/email/review_assigned.txt")
 
-    context = {'assigner': request.user.person, 'prev_team_reviews': prev_team_reviews}
+    context = {'assigner': request.user.person, 'reviewer': reviewer, 'prev_team_reviews': prev_team_reviews}
     msg = render_to_string(template.path, context, request=request)
 
     email_review_request_change(