diff --git a/ietf/iesg/tests.py b/ietf/iesg/tests.py index f73cf44f7..eff5cc0e4 100644 --- a/ietf/iesg/tests.py +++ b/ietf/iesg/tests.py @@ -56,6 +56,12 @@ class IESGTests(TestCase): r = self.client.get(url) self.assertEqual(r.status_code, 200) self.assertTrue(m.desc in unicontent(r)) + draft.group.state_id = 'conclude' + draft.group.save() + r = self.client.get(url) + self.assertEqual(r.status_code, 200) + self.assertFalse(m.desc in unicontent(r)) + def test_review_decisions(self): draft = make_test_data() diff --git a/ietf/iesg/views.py b/ietf/iesg/views.py index 64f3098f1..ee3a82ff2 100644 --- a/ietf/iesg/views.py +++ b/ietf/iesg/views.py @@ -498,7 +498,7 @@ def discusses(request): def milestones_needing_review(request): # collect milestones, grouped on AD and group ads = {} - for m in GroupMilestone.objects.filter(state="review").exclude(group__state="concluded").distinct().select_related("group"): + for m in GroupMilestone.objects.filter(state="review").exclude(group__state="conclude").distinct().select_related("group"): if m.group.ad_role(): groups = ads.setdefault(m.group.ad_role().person, {}) milestones = groups.setdefault(m.group, []) diff --git a/ietf/templates/iesg/milestones_needing_review.html b/ietf/templates/iesg/milestones_needing_review.html index 3a4545354..e2d6ee01c 100644 --- a/ietf/templates/iesg/milestones_needing_review.html +++ b/ietf/templates/iesg/milestones_needing_review.html @@ -2,6 +2,10 @@ {# Copyright The IETF Trust 2015, All Rights Reserved #} {% load origin %} +{% block morecss %} +.panel-heading {font-size:150%; } +{% endblock morecss %} + {% block title %}Milestones under review{% endblock %} {% block content %} @@ -9,12 +13,16 @@

Milestones under review

{% for ad in ads %} -

{{ ad.plain_name }}

- {% for g in ad.groups_needing_review %} -

{{ g.name }} ({{ g.acronym }})

- {% include "group/milestones.html" with milestones=g.milestones_needing_review %} - All {{ g.acronym }} milestones - {% endfor %} +
+
{{ ad.plain_name }}
+
+ {% for g in ad.groups_needing_review %} +

{{ g.name }} ({{ g.acronym }})

+ {% include "group/milestones.html" with milestones=g.milestones_needing_review %} + All {{ g.acronym }} milestones + {% endfor %} +
+
{% endfor %} {% endblock %}