From ea1f55e7dc3f5a5af7f306f16c685dbd75620cca Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 21 Dec 2023 15:14:11 -0600 Subject: [PATCH 1/2] fix: count RFCs correctly for doc/ad --- ietf/doc/views_search.py | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py index 2e4231c5ace..3bf926fa9fb 100644 --- a/ietf/doc/views_search.py +++ b/ietf/doc/views_search.py @@ -470,9 +470,11 @@ def ad_workload(request): state_events = doc.docevent_set.filter( Q(type="started_iesg_process") | Q(type="changed_state") - | Q(type="published_rfc") - | Q(type="closed_ballot"), - ).order_by("-time") + | Q(type="closed_ballot") + ) + if doc.became_rfc(): + state_events = state_events | doc.became_rfc().docevent_set.filter(type="published_rfc") + state_events = state_events.order_by("-time") # compute state history for drafts last = now From 604b2983e4d1ad19de1a0d6f984cf9e4520d5747 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 21 Dec 2023 15:19:41 -0600 Subject: [PATCH 2/2] chore: improve query legibility --- ietf/doc/views_search.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py index 3bf926fa9fb..395852eb9e3 100644 --- a/ietf/doc/views_search.py +++ b/ietf/doc/views_search.py @@ -468,9 +468,7 @@ def ad_workload(request): state = doc_state(doc) state_events = doc.docevent_set.filter( - Q(type="started_iesg_process") - | Q(type="changed_state") - | Q(type="closed_ballot") + type__in=["started_iesg_process", "changed_state", "closed_ballot"] ) if doc.became_rfc(): state_events = state_events | doc.became_rfc().docevent_set.filter(type="published_rfc")