altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Make email address formatting consistent. Commit ready for merge.

Browse source 
- Legacy-Id: 10144
This commit is contained in:
Ryan Cross 2015-10-07 21:55:23 +00:00
parent 104878a622
commit 3c0908ef28
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/submit/mail.py
View file

@ -15,7 +15,7 @@ def submission_confirmation_email_list(submission):
doc = Document.objects.get(name=submission.name) doc = Document.objects.get(name=submission.name)
email_list = [i.author.formatted_email() for i in doc.documentauthor_set.all() if not i.author.invalid_address()] email_list = [i.author.formatted_email() for i in doc.documentauthor_set.all() if not i.author.invalid_address()]
except Document.DoesNotExist: except Document.DoesNotExist:
email_list = [u"%s <%s>" % (author["name"], author["email"]) email_list = [u'"%s" <%s>' % (author["name"], author["email"])
for author in submission.authors_parsed() if author["email"]] for author in submission.authors_parsed() if author["email"]]
if submission.submitter_parsed()["email"] and submission.submitter not in email_list: if submission.submitter_parsed()["email"] and submission.submitter not in email_list:
email_list.append(submission.submitter) email_list.append(submission.submitter)
@ -70,7 +70,7 @@ def send_manual_post_request(request, submission, errors):
to_email = settings.IDSUBMIT_TO_EMAIL to_email = settings.IDSUBMIT_TO_EMAIL
cc = [submission.submitter] cc = [submission.submitter]
cc += [u"%s <%s>" % (author["name"], author["email"]) cc += [u'"%s" <%s>' % (author["name"], author["email"])
for author in submission.authors_parsed() if author["email"]] for author in submission.authors_parsed() if author["email"]]
if submission.group: if submission.group:
cc += [r.formatted_email() for r in Role.objects.filter(group=submission.group, name="chair").select_related("email", "person")] cc += [r.formatted_email() for r in Role.objects.filter(group=submission.group, name="chair").select_related("email", "person")]
@ -137,7 +137,7 @@ def announce_new_version(request, submission, draft, state_change_msg):
'msg': state_change_msg}) 'msg': state_change_msg})
def announce_to_authors(request, submission): def announce_to_authors(request, submission):
authors = [u"%s <%s>" % (author["name"], author["email"]) for author in submission.authors_parsed() if author["email"]] authors = [u'"%s" <%s>' % (author["name"], author["email"]) for author in submission.authors_parsed() if author["email"]]
to_email = list(set(submission_confirmation_email_list(submission) + authors)) to_email = list(set(submission_confirmation_email_list(submission) + authors))
from_email = settings.IDSUBMIT_ANNOUNCE_FROM_EMAIL from_email = settings.IDSUBMIT_ANNOUNCE_FROM_EMAIL
subject = 'New Version Notification for %s-%s.txt' % (submission.name, submission.rev) subject = 'New Version Notification for %s-%s.txt' % (submission.name, submission.rev)