Skip to content

Commit a3e4e63

Browse files
microamppselkirk
andauthored
fix: Exclude replaced documents from IESG discusses (#7712)
* fix: Exclude replaced documents from IESG discusses * test: Add checks for filtering replaced IESG drafts * chore: Improve replaced draft filter --------- Co-authored-by: Paul Selkirk <paul@painless-security.com>
1 parent 363c01e commit a3e4e63

File tree

2 files changed

+10
-0
lines changed

2 files changed

+10
-0
lines changed

ietf/iesg/tests.py

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,15 @@ def test_feed(self):
5252
self.assertContains(r, draft.name)
5353
self.assertContains(r, escape(pos.balloter.plain_name()))
5454

55+
# Mark draft as replaced
56+
draft.set_state(State.objects.get(type="draft", slug="repl"))
57+
58+
r = self.client.get(urlreverse("ietf.iesg.views.discusses"))
59+
self.assertEqual(r.status_code, 200)
60+
61+
self.assertNotContains(r, draft.name)
62+
self.assertNotContains(r, escape(pos.balloter.plain_name()))
63+
5564
def test_milestones_needing_review(self):
5665
draft = WgDraftFactory()
5766
RoleFactory(name_id='ad',group=draft.group,person=Person.objects.get(user__username='ad'))

ietf/iesg/views.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -483,6 +483,7 @@ def discusses(request):
483483
models.Q(states__type__in=("statchg", "conflrev"),
484484
states__slug__in=("iesgeval", "defer")),
485485
docevent__ballotpositiondocevent__pos__blocking=True)
486+
possible_docs = possible_docs.exclude(states__in=State.objects.filter(type="draft", slug="repl"))
486487
possible_docs = possible_docs.select_related("stream", "group", "ad").distinct()
487488

488489
docs = []

0 commit comments

Comments
 (0)