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

fix: rectify mixed types in gathering mailtrigger recipients (#7932)

Browse source
This commit is contained in:
Robert Sparks 2024-09-12 17:04:12 -05:00 committed by GitHub
parent b8c6cb34dd
commit 65547a7a9d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
ietf/mailtrigger/models.py
View file

@ -138,16 +138,16 @@ class Recipient(models.Model):
def gather_stream_managers(self, **kwargs): def gather_stream_managers(self, **kwargs):
addrs = [] addrs = []
manager_map = dict( manager_map = dict(
ise = '<rfc-ise@rfc-editor.org>', ise = ['<rfc-ise@rfc-editor.org>'],
irtf = '<irtf-chair@irtf.org>', irtf = ['<irtf-chair@irtf.org>'],
ietf = '<iesg@ietf.org>', ietf = ['<iesg@ietf.org>'],
iab = '<iab-chair@iab.org>', iab = ['<iab-chair@iab.org>'],
editorial = Role.objects.filter(group__acronym="rsab",name_id="chair").values_list("email__address", flat=True), editorial = Role.objects.filter(group__acronym="rsab",name_id="chair").values_list("email__address", flat=True),
) )
if 'streams' in kwargs: if 'streams' in kwargs:
for stream in kwargs['streams']: for stream in kwargs['streams']:
if stream in manager_map: if stream in manager_map:
addrs.append(manager_map[stream]) addrs.extend(manager_map[stream])
return addrs return addrs
def gather_doc_stream_manager(self, **kwargs): def gather_doc_stream_manager(self, **kwargs):
@ -234,7 +234,7 @@ class Recipient(models.Model):
try: try:
submitter = Alias.objects.get(name=submission.submitter).person submitter = Alias.objects.get(name=submission.submitter).person
if submitter and submitter.email(): if submitter and submitter.email():
addrs.extend(["%s <%s>" % (submitter.name, submitter.email().address)]) addrs.append(f"{submitter.name} <{submitter.email().address}>")
except (Alias.DoesNotExist, Alias.MultipleObjectsReturned): except (Alias.DoesNotExist, Alias.MultipleObjectsReturned):
pass pass
return addrs return addrs