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

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

Browse source 
Added listing all the area directors back. Related to #1889.
 - Legacy-Id: 10743
Note: SVN reference [10726] has been migrated to Git commit 87e2653f56
This commit is contained in:
Henrik Levkowetz 2016-01-26 21:55:32 +00:00
parent b76ea5d744 87e2653f56
commit 8d565f5fb7
3 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
ietf/doc/mails.py
View file

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

2
ietf/doc/utils_charter.py
View file

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

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

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