Skip to content

Commit 892f12e

Browse files
committed
Merged in [14403] from rjsparks@nostrum.com:
Fixed a typo in the milestones under review view. Added bootstrap panels. Fixes ietf-tools#2427, - Legacy-Id: 14408 Note: SVN reference [14403] has been migrated to Git commit d415d86
2 parents 920a73a + d415d86 commit 892f12e

3 files changed

Lines changed: 21 additions & 7 deletions

File tree

ietf/iesg/tests.py

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,12 @@ def test_milestones_needing_review(self):
5656
r = self.client.get(url)
5757
self.assertEqual(r.status_code, 200)
5858
self.assertTrue(m.desc in unicontent(r))
59+
draft.group.state_id = 'conclude'
60+
draft.group.save()
61+
r = self.client.get(url)
62+
self.assertEqual(r.status_code, 200)
63+
self.assertFalse(m.desc in unicontent(r))
64+
5965

6066
def test_review_decisions(self):
6167
draft = make_test_data()

ietf/iesg/views.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -498,7 +498,7 @@ def discusses(request):
498498
def milestones_needing_review(request):
499499
# collect milestones, grouped on AD and group
500500
ads = {}
501-
for m in GroupMilestone.objects.filter(state="review").exclude(group__state="concluded").distinct().select_related("group"):
501+
for m in GroupMilestone.objects.filter(state="review").exclude(group__state="conclude").distinct().select_related("group"):
502502
if m.group.ad_role():
503503
groups = ads.setdefault(m.group.ad_role().person, {})
504504
milestones = groups.setdefault(m.group, [])

ietf/templates/iesg/milestones_needing_review.html

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,27 @@
22
{# Copyright The IETF Trust 2015, All Rights Reserved #}
33
{% load origin %}
44

5+
{% block morecss %}
6+
.panel-heading {font-size:150%; }
7+
{% endblock morecss %}
8+
59
{% block title %}Milestones under review{% endblock %}
610

711
{% block content %}
812
{% origin %}
913
<h1>Milestones under review</h1>
1014

1115
{% for ad in ads %}
12-
<h2>{{ ad.plain_name }}</h2>
13-
{% for g in ad.groups_needing_review %}
14-
<h3>{{ g.name }} ({{ g.acronym }})</h3>
15-
{% include "group/milestones.html" with milestones=g.milestones_needing_review %}
16-
<a class="btn btn-default" href="{% url 'ietf.group.milestones.edit_milestones;current' group_type=g.type_id acronym=g.acronym %}">All {{ g.acronym }} milestones</a>
17-
{% endfor %}
16+
<div class="panel panel-default">
17+
<div class="panel-heading">{{ ad.plain_name }}</div>
18+
<div class="panel-body">
19+
{% for g in ad.groups_needing_review %}
20+
<h3>{{ g.name }} ({{ g.acronym }})</h3>
21+
{% include "group/milestones.html" with milestones=g.milestones_needing_review %}
22+
<a class="btn btn-default" href="{% url 'ietf.group.milestones.edit_milestones;current' group_type=g.type_id acronym=g.acronym %}">All {{ g.acronym }} milestones</a>
23+
{% endfor %}
24+
</div>
25+
</div>
1826
{% endfor %}
1927

2028
{% endblock %}

0 commit comments

Comments
 (0)