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

Special-case proposed working groups with respect to milestones, they

Browse source 
get the charter milestones on the WG charter page rather than the
current set
 - Legacy-Id: 5795
This commit is contained in:
Ole Laursen 2013-06-18 11:56:48 +00:00
parent a603b8e056
commit f2b4906f8b
2 changed files with 6 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ietf/templates/wginfo/wg_charter.html
View file

@ -162,13 +162,15 @@ is occasionally incorrect.</span>
</p>
{% endif %}
<h2>Charter for Working Group</h2>
<h2>Charter for {% if wg.state_id == "proposed" %}Proposed{% endif %} Working Group</h2>
<p>{{ wg.charter_text|escape|format_charter|safe }}</p>
<h2>Milestones
<h2>{% if wg.state_id == "proposed" %}Proposed{% endif %} Milestones
{% if wg.state_id != "proposed" %}
{% if user|has_role:"Area Director,Secretariat" or is_chair %}
<a class="button" href="{% url wg_edit_milestones acronym=wg.acronym %}">Add or edit milestones</a>
{% endif %}
{% endif %}
</h2>
{% with wg.milestones as milestones %}{% include "wginfo/milestones.html" %}{% endwith %}

3
ietf/wginfo/views.py
View file

@ -55,7 +55,8 @@ def fill_in_charter_info(wg, include_drafts=False):
wg.techadvisors = Email.objects.filter(role__group=wg, role__name="techadv")
wg.editors = Email.objects.filter(role__group=wg, role__name="editor")
wg.secretaries = Email.objects.filter(role__group=wg, role__name="secr")
wg.milestones = wg.groupmilestone_set.filter(state="active").order_by('due')
milestone_state = "charter" if wg.state_id == "proposed" else "active"
wg.milestones = wg.groupmilestone_set.filter(state=milestone_state).order_by('due')
if include_drafts:
aliases = DocAlias.objects.filter(document__type="draft", document__group=wg).select_related('document').order_by("name")