Skip to content

Commit 4cb42fd

Browse files
committed
Include current milestones in charter action/review announcements,
fixes issue ietf-tools#835. - Legacy-Id: 4473
1 parent bc6bd21 commit 4cb42fd

4 files changed

Lines changed: 8 additions & 8 deletions

File tree

ietf/templates/wgcharter/action_text.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }})
55

66
{% filter wordwrap:73 %}{% ifequal action_type "Formed" %}A new IETF working group has been formed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal action_type "Rechartered" %}The {{ wg.name }} ({{ wg.acronym }}) working group in the {{ wg.parent.name }} of the IETF has been rechartered.{% endifequal %} For additional information please contact the Area Directors or the WG Chair{{ chairs|pluralize}}.
77

8-
{% include "wgcharter/wg_info.txt" %}
9-
10-
{% endfilter %}
11-
{% endautoescape %}
8+
{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %}

ietf/templates/wgcharter/review_text.txt

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,4 @@ Subject: WG Review: {{ wg.name }} ({{ wg.acronym }})
55

66
{% filter wordwrap:73 %}{% ifequal review_type "new" %}A new IETF working group has been proposed in the {{ wg.parent.name }}.{% endifequal %}{% ifequal review_type "recharter" %}The {{ wg.name }} ({{wg.acronym}}) working group in the {{ wg.parent.name }} of the IETF is undergoing rechartering.{% endifequal %} The IESG has not made any determination yet. The following draft charter was submitted, and is provided for informational purposes only. Please send your comments to the IESG mailing list (iesg at ietf.org) by {{ review_date }}.
77

8-
{% include "wgcharter/wg_info.txt" %}
9-
10-
{% endfilter %}
11-
{% endautoescape %}
8+
{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %}

ietf/templates/wgcharter/wg_info.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@ Current Status: {{ wg.state.name }} Working Group
2222
Charter of Working Group:
2323

2424
{{ charter_text }}
25+
26+
Milestones:
27+
{% for milestone in milestones %} {% if milestone.done %}Done {% else %}{{ milestone.expected_due_date|date:"M Y" }}{% endif %} - {{ milestone.desc|safe }}
28+
{% endfor %}

ietf/wgcharter/mails.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,7 @@ def default_action_text(wg, charter, user):
7979
chairs=wg.role_set.filter(name="chair"),
8080
secr=wg.role_set.filter(name="secr"),
8181
techadv=wg.role_set.filter(name="techadv"),
82+
milestones=wg.groupmilestone_set.all(),
8283
ad_email=wg.ad.role_email("ad") if wg.ad else None,
8384
action_type=action,
8485
))
@@ -98,6 +99,7 @@ def default_review_text(wg, charter, user):
9899
chairs=wg.role_set.filter(name="chair"),
99100
secr=wg.role_set.filter(name="secr"),
100101
techadv=wg.role_set.filter(name="techadv"),
102+
milestones=wg.groupmilestone_set.all(),
101103
ad_email=wg.ad.role_email("ad") if wg.ad else None,
102104
review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(),
103105
review_type="new" if wg.state_id == "proposed" else "recharter",

0 commit comments

Comments
 (0)