Some tweaks related to the changes related to ietf-tools#2830.

levkowetz · levkowetz · commit 424dcfb42dc1 · 2019-11-21T06:01:56.000Z
- Legacy-Id: 17076
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
@@ -1149,7 +1149,7 @@ def test_edit_deadline(self):
         review_req = reload_db_objects(review_req)
         self.assertEqual(review_req.deadline,new_deadline)
         self.assertEqual(len(outbox), 1)
-        self.assertIn('<reviewsecretary@example.com>', outbox[0]["To"])
+        self.assertIn('reviewsecretary@example.com', outbox[0]["Cc"])
         self.assertIn('<reviewer@example.com>', outbox[0]["To"])
         self.assertIn('Deadline changed', outbox[0]['Subject'])
 
diff --git a/ietf/name/fixtures/names.json b/ietf/name/fixtures/names.json
@@ -1,10 +1,10 @@
 [
   {
     "fields": {
-      "content": "{{ assigner.ascii }} has assigned you as a reviewer for this document.\n\n{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}\n- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  \n{% endfor %}\n",
+      "content": "{{ assigner.ascii }} has assigned {{ reviewer.person.ascii }} as a reviewer for this document.\n\n{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}\n- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }}  \n{% endfor %}\n",
       "group": null,
       "path": "/group/defaults/email/review_assigned.txt",
-      "title": "",
+      "title": "Default template for review assignment email",
       "type": "django",
       "variables": null
     },
diff --git a/ietf/review/utils.py b/ietf/review/utils.py
@@ -374,6 +374,9 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se
         skip_review_requested_by=not notify_requested_by,
     )
     
+    if cc and not to:
+        to = cc
+        cc = []
     if to or cc:
         url = urlreverse("ietf.doc.views_review.review_request_forced_login", kwargs={ "name": review_req.doc.name, "request_id": review_req.pk })
         url = request.build_absolute_uri(url)

Original file line number	Diff line number	Diff line change
`@@ -1,10 +1,10 @@`
`1`	`1`	`[`
`2`	`2`	`{`
`3`	`3`	`"fields": {`
`4`		`- "content": "{{ assigner.ascii }} has assigned you as a reviewer for this document.\n\n{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}\n- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }} \n{% endfor %}\n",`
	`4`	`+ "content": "{{ assigner.ascii }} has assigned {{ reviewer.person.ascii }} as a reviewer for this document.\n\n{% if prev_team_reviews %}This team has completed other reviews of this document:{% endif %}{% for assignment in prev_team_reviews %}\n- {{ assignment.completed_on }} {{ assignment.reviewer.person.ascii }} -{% if assignment.reviewed_rev %}{{ assignment.reviewed_rev }}{% else %}{{ assignment.review_request.requested_rev }}{% endif %} {{ assignment.result.name }} \n{% endfor %}\n",`
`5`	`5`	`"group": null,`
`6`	`6`	`"path": "/group/defaults/email/review_assigned.txt",`
`7`		`- "title": "",`
	`7`	`+ "title": "Default template for review assignment email",`
`8`	`8`	`"type": "django",`
`9`	`9`	`"variables": null`
`10`	`10`	`},`
Original file line number	Diff line number	Diff line change
`@@ -374,6 +374,9 @@ def email_review_request_change(request, review_req, subject, msg, by, notify_se`
`374`	`374`	`skip_review_requested_by=not notify_requested_by,`
`375`	`375`	`)`
`376`	`376`
	`377`	`+ if cc and not to:`
	`378`	`+ to = cc`
	`379`	`+ cc = []`
`377`	`380`	`if to or cc:`
`378`	`381`	`url = urlreverse("ietf.doc.views_review.review_request_forced_login", kwargs={ "name": review_req.doc.name, "request_id": review_req.pk })`
`379`	`382`	`url = request.build_absolute_uri(url)`