From d22da6259b523b6a3adce2d639495f3b1df65680 Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 13 Dec 2019 18:37:30 +0000
Subject: [PATCH] Only gather addresses instead of name_addrs for the
group_secretaries Mailtrigger Recipient. Fixes #2847. Commit ready for merge.
- Legacy-Id: 17148
---
ietf/doc/tests_review.py | 4 ++--
ietf/mailtrigger/models.py | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/ietf/doc/tests_review.py b/ietf/doc/tests_review.py
index d57b54116..1856d5fcb 100644
--- a/ietf/doc/tests_review.py
+++ b/ietf/doc/tests_review.py
@@ -229,7 +229,7 @@ class ReviewTests(TestCase):
self.assertEqual(len(outbox), 1)
self.assertIn('<reviewer@example.com>', outbox[0]["To"])
self.assertNotIn("<reviewsecretary@example.com>", outbox[0]["To"])
- self.assertIn("<reviewsecretary2@example.com>", outbox[0]["CC"])
+ self.assertIn("reviewsecretary2@example.com", outbox[0]["CC"])
mail_content = outbox[0].get_payload(decode=True).decode("utf-8").lower()
self.assertIn("closed", mail_content)
self.assertIn("review_request_close_comment", mail_content)
@@ -1055,7 +1055,7 @@ class ReviewTests(TestCase):
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]["Cc"])
+ 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/mailtrigger/models.py b/ietf/mailtrigger/models.py
index ed70ddeb1..8cc335b49 100644
--- a/ietf/mailtrigger/models.py
+++ b/ietf/mailtrigger/models.py
@@ -183,7 +183,7 @@ class Recipient(models.Model):
addrs = get_email_addresses_from_text(rts.secr_mail_alias)
else:
for role in group.role_set.filter(name='secr'):
- addrs.append(role.person.formatted_email())
+ addrs.append(role.email.address)
return addrs
def gather_review_req_reviewers(self, **kwargs):