Skip to content

Commit 31fb872

Browse files
committed
Merged in [9306] from rjsparks@nostrum.com:
Add pre-ads to .ad aliases. Keep draft aliases for drafts that have become RFCs for some time. - Legacy-Id: 9310 Note: SVN reference [9306] has been migrated to Git commit 5fb3198
2 parents a9e249e + 5fb3198 commit 31fb872

3 files changed

Lines changed: 4 additions & 2 deletions

File tree

hold-for-merge

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
# -*- conf-mode -*-
22

3+
personal/rcross/v5.12.4.dev0@9307 # Failed pyflakes, fixed in 9308
34
personal/rcross/v5.7.3-dev0@8640 # Rework: make the check_permissions() decorator handle the case where the user isn't logged in
45
personal/rcross/v5.6.3-dev0@8237 # Includes other merges; merge personal/rcross/v5.6.2-dev0@8216 instead
56
personal/liudapeng/v5.5.1-dev0@7925 # alternative resolution desired

ietf/bin/generate-draft-aliases

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -133,7 +133,8 @@ if __name__ == '__main__':
133133
for draft in interesting_drafts.distinct().iterator():
134134
# Omit RFCs, we care only about drafts
135135
if draft.docalias_set.filter(name__startswith='rfc'):
136-
continue
136+
if (datetime.datetime.now() - draft.latest_event(type='published_rfc').time) > datetime.timedelta(days= 365 * 3 ):
137+
continue
137138

138139
alias = draft.name
139140
all = []

ietf/group/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ def get_area_ads_emails(area):
4848
if area.acronym == 'none':
4949
return []
5050
emails = [r.email.email_address()
51-
for r in area.role_set.filter(name__in=('ad', 'chair'))]
51+
for r in area.role_set.filter(name__in=('pre-ad', 'ad', 'chair'))]
5252
return filter(None, emails)
5353

5454
def get_group_ads_emails(wg):

0 commit comments

Comments
 (0)