Include current milestones in charter action/review announcements,

fixes issue #835.
 - Legacy-Id: 4473
This commit is contained in:
Ole Laursen 2012-06-19 17:06:56 +00:00
parent bc6bd21b94
commit 4cb42fd91c
4 changed files with 8 additions and 8 deletions

View file

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

View file

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

View file

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

View file

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