Skip to content

Commit f2b4906

Browse files
committed
Special-case proposed working groups with respect to milestones, they
get the charter milestones on the WG charter page rather than the current set - Legacy-Id: 5795
1 parent a603b8e commit f2b4906

2 files changed

Lines changed: 6 additions & 3 deletions

File tree

ietf/templates/wginfo/wg_charter.html

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -162,13 +162,15 @@
162162
</p>
163163
{% endif %}
164164

165-
<h2>Charter for Working Group</h2>
165+
<h2>Charter for {% if wg.state_id == "proposed" %}Proposed{% endif %} Working Group</h2>
166166
<p>{{ wg.charter_text|escape|format_charter|safe }}</p>
167167

168-
<h2>Milestones
168+
<h2>{% if wg.state_id == "proposed" %}Proposed{% endif %} Milestones
169+
{% if wg.state_id != "proposed" %}
169170
{% if user|has_role:"Area Director,Secretariat" or is_chair %}
170171
<a class="button" href="{% url wg_edit_milestones acronym=wg.acronym %}">Add or edit milestones</a>
171172
{% endif %}
173+
{% endif %}
172174
</h2>
173175

174176
{% with wg.milestones as milestones %}{% include "wginfo/milestones.html" %}{% endwith %}

ietf/wginfo/views.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,8 @@ def fill_in_charter_info(wg, include_drafts=False):
5555
wg.techadvisors = Email.objects.filter(role__group=wg, role__name="techadv")
5656
wg.editors = Email.objects.filter(role__group=wg, role__name="editor")
5757
wg.secretaries = Email.objects.filter(role__group=wg, role__name="secr")
58-
wg.milestones = wg.groupmilestone_set.filter(state="active").order_by('due')
58+
milestone_state = "charter" if wg.state_id == "proposed" else "active"
59+
wg.milestones = wg.groupmilestone_set.filter(state=milestone_state).order_by('due')
5960

6061
if include_drafts:
6162
aliases = DocAlias.objects.filter(document__type="draft", document__group=wg).select_related('document').order_by("name")

0 commit comments

Comments
 (0)