Merged in [17148] from rjsparks@nostrum.com:
Only gather addresses instead of name_addrs for the group_secretaries Mailtrigger Recipient. Fixes #2847.
- Legacy-Id: 17156
Note: SVN reference [17148] has been migrated to Git commit d22da6259b
This commit is contained in:
commit
1d0e8b7527
|
@ -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'])
|
||||
|
||||
|
|
|
@ -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):
|
||||
|
|
Loading…
Reference in a new issue