From 9170395905f4e9a153ee101cf463bd721f331b39 Mon Sep 17 00:00:00 2001 From: Henrik Levkowetz Date: Wed, 17 Jul 2019 14:29:42 +0000 Subject: [PATCH] Added a email gather handler for submission_submitter that tries an Alias name lookuup if the submitter doesn't look as if it contains an email address. - Legacy-Id: 16508 --- ietf/mailtrigger/models.py | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/ietf/mailtrigger/models.py b/ietf/mailtrigger/models.py index 7de884552..531733af5 100644 --- a/ietf/mailtrigger/models.py +++ b/ietf/mailtrigger/models.py @@ -10,7 +10,7 @@ from django.utils.encoding import python_2_unicode_compatible from email.utils import parseaddr from ietf.utils.mail import formataddr, get_email_addresses_from_text -from ietf.person.models import Email +from ietf.person.models import Email, Alias from ietf.review.models import ReviewTeamSettings import debug # pyflakes:ignore @@ -204,6 +204,23 @@ class Recipient(models.Model): addrs.extend(["%s <%s>" % (author["name"], author["email"]) for author in submission.authors if author.get("email")]) return addrs + def gather_submission_submitter(self, **kwargs): + """ + Returns a list of name and email, e.g.: [ 'Ano Nymous ' ] + """ + addrs = [] + if 'submission' in kwargs: + submission = kwargs['submission'] + if '@' in submission.submitter: + addrs.extend([ get_email_addresses_from_text(submission.submitter) ]) + else: + try: + submitter = Alias.objects.get(name=submission.submitter).person + addrs.extend(["%s <%s>" % (submitter.name, submitter.email().address)]) + except (Alias.DoesNotExist, Alias.MultipleObjectsReturned): + pass + return addrs + def gather_submission_group_chairs(self, **kwargs): addrs = [] if 'submission' in kwargs: