From 87e2653f5601ef35024972c2b1e0470fa3cfa61f Mon Sep 17 00:00:00 2001
From: Robert Sparks <rjsparks@nostrum.com>
Date: Fri, 22 Jan 2016 21:17:44 +0000
Subject: [PATCH] Added listing all the area directors back. Related to #1889.
 Commit ready for merge.  - Legacy-Id: 10726

---
 ietf/doc/mails.py                         | 1 +
 ietf/doc/utils_charter.py                 | 2 ++
 ietf/templates/doc/charter/group_info.txt | 5 ++++-
 3 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py
index c18dba019..267fb2e90 100644
--- a/ietf/doc/mails.py
+++ b/ietf/doc/mails.py
@@ -476,6 +476,7 @@ def email_charter_internal_review(request, charter):
                    chairs=charter.group.role_set.filter(name="chair"),
                    secr=charter.group.role_set.filter(name="secr"),
                    ads=charter.group.role_set.filter(name='ad'),
+                   parent_ads=charter.group.parent.role_set.filter(name='ad'),
                    techadv=charter.group.role_set.filter(name="techadv"),
                    milestones=charter.group.groupmilestone_set.filter(state="charter"),
               ),
diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py
index 715dc70bf..4975eecf9 100644
--- a/ietf/doc/utils_charter.py
+++ b/ietf/doc/utils_charter.py
@@ -112,6 +112,7 @@ def default_action_text(group, charter, by):
                                    secr=group.role_set.filter(name="secr"),
                                    techadv=group.role_set.filter(name="techadv"),
                                    ads=group.role_set.filter(name='ad'),
+                                   parent_ads=group.parent.role_set.filter(name='ad'),
                                    milestones=group.groupmilestone_set.filter(state="charter"),
                                    action_type=action,
                                    to=addrs.to,
@@ -147,6 +148,7 @@ def default_review_text(group, charter, by):
                                     chairs=group.role_set.filter(name="chair"),
                                     secr=group.role_set.filter(name="secr"),
                                     ads=group.role_set.filter(name='ad'),
+                                    parent_ads=group.parent.role_set.filter(name='ad'),
                                     techadv=group.role_set.filter(name="techadv"),
                                     milestones=group.groupmilestone_set.filter(state="charter"),
                                     review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
diff --git a/ietf/templates/doc/charter/group_info.txt b/ietf/templates/doc/charter/group_info.txt
index 8c686b8c2..7b9b9362e 100644
--- a/ietf/templates/doc/charter/group_info.txt
+++ b/ietf/templates/doc/charter/group_info.txt
@@ -15,7 +15,10 @@ Assigned Area Director{{ads|length|pluralize}}:{% if ads %}
 {% for r in ads %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}{% else %}
   TBD
-{% endif %}{% endif %}{% if techadv %}
+{% endif %}{% if parent_ads %}
+{{group.parent.name}} Directors:
+{% for r in parent_ads %}  {{ r.person.plain_name }} <{{r.email.address }}>
+{% endfor %}{% endif %}{% endif %}{% if techadv %}
 Technical advisors:
 {% for r in techadv %}  {{ r.person.plain_name }} <{{r.email.address}}>
 {% endfor %}{% endif %} {% if group.list_email %}