altf4arnold/datatracker
1
0
Fork 0
Code Issues Pull requests Actions 3 Packages Projects Releases Wiki Activity

Merged in [10723] from rjsparks@nostrum.com:

Browse source 
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.
 - Legacy-Id: 10741
Note: SVN reference [10723] has been migrated to Git commit dc2593ebe5
This commit is contained in:
Henrik Levkowetz 2016-01-26 21:40:29 +00:00
parent bc9a85a075 dc2593ebe5
commit 3c9636e988
4 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ietf/doc/mails.py
View file

@ -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"),
),

2
ietf/doc/tests_charter.py
View file

@ -111,7 +111,7 @@ class EditCharterTests(TestCase):
for word in ["Chairs", "Ames Man <ameschairman@ietf.org>",
"Secretaries", "Secretary <amessecretary@ietf.org>",
"Assigned Area Director", "Areað Irector <aread@ietf.org>",
"Area Directors", "Mailing list", "ames-wg@ietf.org",
"Mailing list", "ames-wg@ietf.org",
"Charter", "Milestones"]:
self.assertIn(word, body)

2
ietf/doc/utils_charter.py
View file

@ -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(),

10
ietf/templates/doc/charter/group_info.txt
View file

@ -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 }}