Skip to content

Commit b586b81

Browse files
committed
Merged in [15677] from rjsparks@nostrum.com:
Tune the recipients when a teams settings or a reviewer indicate ADs should be notified about a review. - Legacy-Id: 15682 Note: SVN reference [15677] has been migrated to Git commit 24b8324
2 parents c2acf9e + 24b8324 commit b586b81

3 files changed

Lines changed: 29 additions & 6 deletions

File tree

ietf/mailtrigger/migrations/0003_add_review_notify_ad.py

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,12 +13,16 @@ def forward(apps, schema_editor):
1313
desc = "The reviewed document's responsible area director",
1414
template = '{% if review_req.doc.ad %}{{review_req.doc.ad.email_address}}{% endif %}'
1515
)
16+
Recipient.objects.create(
17+
slug = 'review_team_ads',
18+
desc = "The ADs of the team reviewing the document"
19+
)
1620

1721
review_notify_ad = MailTrigger.objects.create(
1822
slug = 'review_notify_ad',
1923
desc = 'Recipients when a team notifies area directors when a review with one of a certain set of results (typically results indicating problem) is submitted',
2024
)
21-
review_notify_ad.to.set(Recipient.objects.filter(slug='review_doc_ad'))
25+
review_notify_ad.to.set(Recipient.objects.filter(slug__in=['review_doc_ad','review_team_ads']))
2226

2327

2428
def reverse(apps, schema_editor):
@@ -27,6 +31,7 @@ def reverse(apps, schema_editor):
2731

2832
MailTrigger.objects.filter(slug='review_notify_ad').delete()
2933
Recipient.objects.filter(slug='review_doc_ad').delete()
34+
Recipient.objects.filter(slug='review_team_ads').delete()
3035

3136
class Migration(migrations.Migration):
3237

ietf/mailtrigger/models.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -316,3 +316,12 @@ def gather_session_requester(self, **kwargs):
316316
session = kwargs['session']
317317
addrs.append(session.requested_by.role_email('chair').address)
318318
return addrs
319+
320+
def gather_review_team_ads(self, **kwargs):
321+
addrs=[]
322+
if 'review_req' in kwargs:
323+
review_req = kwargs['review_req']
324+
if review_req.team.parent:
325+
for role in review_req.team.parent.role_set.filter(name='ad'):
326+
addrs.append(role.email.address)
327+
return addrs

ietf/name/fixtures/names.json

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3574,7 +3574,8 @@
35743574
"cc": [],
35753575
"desc": "Recipients when a team notifies area directors when a review with one of a certain set of results (typically results indicating problem) is submitted",
35763576
"to": [
3577-
"review_doc_ad"
3577+
"review_doc_ad",
3578+
"review_team_ads"
35783579
]
35793580
},
35803581
"model": "mailtrigger.mailtrigger",
@@ -4216,6 +4217,14 @@
42164217
"model": "mailtrigger.recipient",
42174218
"pk": "review_doc_group_mail_list"
42184219
},
4220+
{
4221+
"fields": {
4222+
"desc": "The ADs of the team reviewing the document",
4223+
"template": null
4224+
},
4225+
"model": "mailtrigger.recipient",
4226+
"pk": "review_team_ads"
4227+
},
42194228
{
42204229
"fields": {
42214230
"desc": "The review team's email list",
@@ -10494,7 +10503,7 @@
1049410503
"fields": {
1049510504
"command": "xym",
1049610505
"switch": "--version",
10497-
"time": "2018-11-01T00:08:56.002",
10506+
"time": "2018-11-02T00:08:27.707",
1049810507
"used": true,
1049910508
"version": "xym 0.4"
1050010509
},
@@ -10505,7 +10514,7 @@
1050510514
"fields": {
1050610515
"command": "pyang",
1050710516
"switch": "--version",
10508-
"time": "2018-11-01T00:08:57.320",
10517+
"time": "2018-11-02T00:08:28.485",
1050910518
"used": true,
1051010519
"version": "pyang 1.7.5"
1051110520
},
@@ -10516,7 +10525,7 @@
1051610525
"fields": {
1051710526
"command": "yanglint",
1051810527
"switch": "--version",
10519-
"time": "2018-11-01T00:08:57.507",
10528+
"time": "2018-11-02T00:08:28.661",
1052010529
"used": true,
1052110530
"version": "yanglint 0.14.80"
1052210531
},
@@ -10527,7 +10536,7 @@
1052710536
"fields": {
1052810537
"command": "xml2rfc",
1052910538
"switch": "--version",
10530-
"time": "2018-11-01T00:08:59.405",
10539+
"time": "2018-11-02T00:08:29.566",
1053110540
"used": true,
1053210541
"version": "xml2rfc 2.12.3"
1053310542
},

0 commit comments

Comments
 (0)