From 4cb42fd91ce2c5cfa47be2b8c9c1a6c47e93889b Mon Sep 17 00:00:00 2001 From: Ole Laursen Date: Tue, 19 Jun 2012 17:06:56 +0000 Subject: [PATCH] Include current milestones in charter action/review announcements, fixes issue #835. - Legacy-Id: 4473 --- ietf/templates/wgcharter/action_text.txt | 5 +---- ietf/templates/wgcharter/review_text.txt | 5 +---- ietf/templates/wgcharter/wg_info.txt | 4 ++++ ietf/wgcharter/mails.py | 2 ++ 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/ietf/templates/wgcharter/action_text.txt b/ietf/templates/wgcharter/action_text.txt index 430c8a979..30f7435de 100644 --- a/ietf/templates/wgcharter/action_text.txt +++ b/ietf/templates/wgcharter/action_text.txt @@ -5,7 +5,4 @@ Subject: WG Action: {{ action_type }} {{ wg.name }} ({{ wg.acronym }}) {% 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}}. -{% include "wgcharter/wg_info.txt" %} - -{% endfilter %} -{% endautoescape %} +{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %} diff --git a/ietf/templates/wgcharter/review_text.txt b/ietf/templates/wgcharter/review_text.txt index fb8087f19..a683516e9 100644 --- a/ietf/templates/wgcharter/review_text.txt +++ b/ietf/templates/wgcharter/review_text.txt @@ -5,7 +5,4 @@ Subject: WG Review: {{ wg.name }} ({{ wg.acronym }}) {% 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 }}. -{% include "wgcharter/wg_info.txt" %} - -{% endfilter %} -{% endautoescape %} +{% include "wgcharter/wg_info.txt" %}{% endfilter %}{% endautoescape %} diff --git a/ietf/templates/wgcharter/wg_info.txt b/ietf/templates/wgcharter/wg_info.txt index 8c0597df3..209768f97 100644 --- a/ietf/templates/wgcharter/wg_info.txt +++ b/ietf/templates/wgcharter/wg_info.txt @@ -22,3 +22,7 @@ Current Status: {{ wg.state.name }} Working Group Charter of Working Group: {{ charter_text }} + +Milestones: +{% for milestone in milestones %} {% if milestone.done %}Done {% else %}{{ milestone.expected_due_date|date:"M Y" }}{% endif %} - {{ milestone.desc|safe }} +{% endfor %} diff --git a/ietf/wgcharter/mails.py b/ietf/wgcharter/mails.py index 834c583e4..e59da36cc 100644 --- a/ietf/wgcharter/mails.py +++ b/ietf/wgcharter/mails.py @@ -79,6 +79,7 @@ def default_action_text(wg, charter, user): chairs=wg.role_set.filter(name="chair"), secr=wg.role_set.filter(name="secr"), techadv=wg.role_set.filter(name="techadv"), + milestones=wg.groupmilestone_set.all(), ad_email=wg.ad.role_email("ad") if wg.ad else None, action_type=action, )) @@ -98,6 +99,7 @@ def default_review_text(wg, charter, user): chairs=wg.role_set.filter(name="chair"), secr=wg.role_set.filter(name="secr"), techadv=wg.role_set.filter(name="techadv"), + milestones=wg.groupmilestone_set.all(), ad_email=wg.ad.role_email("ad") if wg.ad else None, review_date=(datetime.date.today() + datetime.timedelta(weeks=1)).isoformat(), review_type="new" if wg.state_id == "proposed" else "recharter",