Skip to content

Commit f697d9e

Browse files
committed
Merged in [14404] from rjsparks@nostrum.com:
Include an explicitly set Responsible ADs email addresses in generated aliases when a document has a group. - Legacy-Id: 14424 Note: SVN reference [14404] has been migrated to Git commit e36cad6
2 parents 5d86b65 + e36cad6 commit f697d9e

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

ietf/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
__version__ = "6.67.2.dev0"
88

99
# set this to ".p1", ".p2", etc. after patching
10-
__patch__ = ""
10+
__patch__ = ".p1"
1111

1212
__date__ = "$Date$"
1313

ietf/bin/generate-draft-aliases

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,11 @@ def get_draft_ad_emails(draft):
5454
# If working group document, return current WG ADs
5555
wg = draft.group
5656
if wg and wg.acronym != 'none' and wg.parent and wg.parent.acronym != 'none':
57-
return get_group_ad_emails(wg)
57+
ad_emails = get_group_ad_emails(wg)
58+
if draft.ad:
59+
if draft.ad.email_address() not in ad_emails:
60+
ad_emails.add(draft.ad.email_address())
61+
return ad_emails
5862
# If not, return explicit AD set (whether up to date or not)
5963
ad = draft.ad
6064
#return [ad and ad.user and ad.user.email]

ietf/secr/proceedings/proc_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
from ietf.utils.mail import send_mail
2525

2626
AUDIO_FILE_RE = re.compile(r'ietf(?P<number>[\d]+)-(?P<room>.*)-(?P<time>[\d]{8}-[\d]{4})')
27-
VIDEO_TITLE_RE = re.compile(r'IETF(?P<number>\d{2})-(?P<name>.*)-(?P<date>\d{8})-(?P<time>\d{4})')
27+
VIDEO_TITLE_RE = re.compile(r'IETF(?P<number>[\d]+)-(?P<name>.*)-(?P<date>\d{8})-(?P<time>\d{4})')
2828

2929

3030

0 commit comments

Comments
 (0)