Skip to content

Commit a662851

Browse files
committed
Merged in [15356] from ben@nostrum.com:
Change newlines to commas in to contacts for new liaison email notification. Fixes issue 2525. - Legacy-Id: 15400 Note: SVN reference [15356] has been migrated to Git commit f8853fa
2 parents 2e83c52 + f8853fa commit a662851

2 files changed

Lines changed: 11 additions & 1 deletion

File tree

ietf/liaisons/forms.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -276,12 +276,22 @@ def clean_from_contact(self):
276276
raise forms.ValidationError('Email address does not exist')
277277
return email
278278

279+
# Note to future person: This is the wrong place to fix the new lines
280+
# in cc_contacts and to_contacts. Those belong in the save function.
281+
# Or at least somewhere other than here.
279282
def clean_cc_contacts(self):
280283
'''Return a comma separated list of addresses'''
281284
cc_contacts = self.cleaned_data.get('cc_contacts')
282285
cc_contacts = cc_contacts.replace('\r\n',',')
283286
cc_contacts = cc_contacts.rstrip(',')
284287
return cc_contacts
288+
## to_contacts can also have new lines
289+
def clean_to_contacts(self):
290+
'''Return a comma separated list of addresses'''
291+
to_contacts = self.cleaned_data.get('to_contacts')
292+
to_contacts = to_contacts.replace('\r\n',',')
293+
to_contacts = to_contacts.rstrip(',')
294+
return to_contacts
285295

286296
def clean(self):
287297
if not self.cleaned_data.get('body', None) and not self.has_attachments():

ietf/settings.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -883,7 +883,7 @@ def skip_unreadable_post(record):
883883
TRAC_SVN_DIR_PATTERN = "/a/svn/group/%s"
884884
#TRAC_SVN_URL_PATTERN = "https://svn.ietf.org/svn/group/%s/"
885885

886-
TRAC_CREATE_GROUP_TYPES = ['wg', 'rg', 'area', 'team', 'dir', 'review', 'ag', ]
886+
TRAC_CREATE_GROUP_TYPES = ['wg', 'rg', 'area', 'team', 'dir', 'review', 'ag', 'nomcom', ]
887887
TRAC_CREATE_GROUP_STATES = ['bof', 'active', ]
888888
TRAC_CREATE_GROUP_ACRONYMS = ['iesg', 'iaoc', 'ietf', ]
889889
TRAC_CREATE_ADHOC_WIKIS = [

0 commit comments

Comments
 (0)