From dc2593ebe5140f58902ba7255bad76a82b1fba57 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Fri, 22 Jan 2016 20:47:45 +0000 Subject: [PATCH] Tweak the rendering of Area Directors in the charter text used in new-work, internal review, external review, and group action messages to display. Fixes #1889. Commit ready to merge. - Legacy-Id: 10723 --- ietf/doc/mails.py | 2 +- ietf/doc/tests_charter.py | 2 +- ietf/doc/utils_charter.py | 2 ++ ietf/templates/doc/charter/group_info.txt | 10 +++------- 4 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ietf/doc/mails.py b/ietf/doc/mails.py index f1e748bec..c18dba019 100644 --- a/ietf/doc/mails.py +++ b/ietf/doc/mails.py @@ -475,7 +475,7 @@ def email_charter_internal_review(request, charter): charter_url=settings.IDTRACKER_BASE_URL + charter.get_absolute_url(), chairs=charter.group.role_set.filter(name="chair"), secr=charter.group.role_set.filter(name="secr"), - ads=charter.group.role_set.filter(name='ad').values_list('person__name',flat=True), + ads=charter.group.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/tests_charter.py b/ietf/doc/tests_charter.py index b0fe9ec51..d4c1c02cc 100644 --- a/ietf/doc/tests_charter.py +++ b/ietf/doc/tests_charter.py @@ -111,7 +111,7 @@ class EditCharterTests(TestCase): for word in ["Chairs", "Ames Man ", "Secretaries", "Secretary ", "Assigned Area Director", "Areað Irector ", - "Area Directors", "Mailing list", "ames-wg@ietf.org", + "Mailing list", "ames-wg@ietf.org", "Charter", "Milestones"]: self.assertIn(word, body) diff --git a/ietf/doc/utils_charter.py b/ietf/doc/utils_charter.py index c4f33f8fe..715dc70bf 100644 --- a/ietf/doc/utils_charter.py +++ b/ietf/doc/utils_charter.py @@ -111,6 +111,7 @@ def default_action_text(group, charter, by): chairs=group.role_set.filter(name="chair"), secr=group.role_set.filter(name="secr"), techadv=group.role_set.filter(name="techadv"), + ads=group.role_set.filter(name='ad'), milestones=group.groupmilestone_set.filter(state="charter"), action_type=action, to=addrs.to, @@ -145,6 +146,7 @@ def default_review_text(group, charter, by): charter_text=read_charter_text(charter), chairs=group.role_set.filter(name="chair"), secr=group.role_set.filter(name="secr"), + ads=group.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 207821c46..8c686b8c2 100644 --- a/ietf/templates/doc/charter/group_info.txt +++ b/ietf/templates/doc/charter/group_info.txt @@ -10,19 +10,15 @@ Chairs: {% endif %}{% if secr %} Secretaries: {% for r in secr %} {{ r.person.plain_name }} <{{r.email.address}}> -{% endfor %}{% endif %}{% if charter.group.type_id != "rg" %}{% if ads %} -Area Directors: +{% endfor %}{% endif %}{% if charter.group.type_id != "rg" %} +Assigned Area Director{{ads|length|pluralize}}:{% if ads %} {% for r in ads %} {{ r.person.plain_name }} <{{r.email.address}}> {% endfor %}{% else %} -Area Directors: TBD {% endif %}{% endif %}{% if techadv %} Technical advisors: {% for r in techadv %} {{ r.person.plain_name }} <{{r.email.address}}> -{% endfor %}{% endif %}{% if group.ad_role %} -Assigned Area Director: - {{ group.ad_role.person.plain_name }} <{{ group.ad_role.email.address }}> -{% endif %}{% if group.list_email %} +{% endfor %}{% endif %} {% if group.list_email %} Mailing list: Address: {{ group.list_email }} To subscribe: {{ group.list_subscribe }}