From 0c4ef8c8f6385f043f3227fa57296cfee92e01e2 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 29 Jan 2015 20:32:39 +0000 Subject: [PATCH] Capture out-of-area ADs in draft and group aliases. Fixes #1592. Commit ready for merge. - Legacy-Id: 8948 --- ietf/group/utils.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ietf/group/utils.py b/ietf/group/utils.py index b62ecc75f..307dfdcc8 100644 --- a/ietf/group/utils.py +++ b/ietf/group/utils.py @@ -56,12 +56,13 @@ def get_group_ads_emails(wg): if wg.acronym == 'none': return [] + # Make sure the assigned AD is included (in case that is not one of the area ADs + ad_emails = set([wg.ad_role() and wg.ad_role().email.address]) if wg.parent and wg.parent.acronym != 'none': - # By default, we should use _current_ list of ads! - return get_area_ads_emails(wg.parent) + # Include the _current_ list of ads for the area! + ad_emails.update(get_area_ads_emails(wg.parent)) - # As fallback, just return the single ad within the wg - return [wg.ad_role() and wg.ad_role().email.address] + return list(ad_emails) def get_group_chairs_emails(wg): " Get list of area chairs' emails for a given WG "