From fb4002dbbddf9e0cbffbc91ad454fd36a648a4f8 Mon Sep 17 00:00:00 2001 From: Lars Eggert Date: Tue, 5 Sep 2023 20:16:33 +0300 Subject: [PATCH 01/21] fix: Don't show deferred I-Ds in AD's missing ballot list (#6162) * fix: Don't show deferred I-Ds in AD's missing ballot list Fixes #6152 * Address code review comments --- ietf/doc/views_search.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/ietf/doc/views_search.py b/ietf/doc/views_search.py index 6645333cc..4e791aea7 100644 --- a/ietf/doc/views_search.py +++ b/ietf/doc/views_search.py @@ -749,6 +749,7 @@ def docs_for_ad(request, name): if ( not ballot or doc.get_state_slug("draft") == "repl" + or doc.get_state_slug("draft-iesg") == "defer" or (doc.telechat_date() and doc.telechat_date() > timezone.now().date()) ): continue @@ -801,7 +802,7 @@ def drafts_in_iesg_process(request): def recent_drafts(request, days=7): slowcache = caches['slowpages'] - cache_key = f'recentdraftsview{days}' + cache_key = f'recentdraftsview{days}' cached_val = slowcache.get(cache_key) if not cached_val: since = timezone.now()-datetime.timedelta(days=days) From cd56d43736722921cc005867db98739bdf905de8 Mon Sep 17 00:00:00 2001 From: Paul Selkirk Date: Tue, 5 Sep 2023 13:58:56 -0400 Subject: [PATCH 02/21] fix: Allow secretariat to change the state of a dead draft (#6253) * fix: Allow secretariat to change the state of a dead draft (#6051) * refactor: Move the secretariat-can-edit-dead-state enablement to the template to limit side-effects. * style: Correct whitespace to fully revert file --------- Co-authored-by: Robert Sparks --- ietf/templates/doc/document_draft.html | 2 +- ietf/templates/doc/draft/change_state.html | 9 ++++++++- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index 769d5ec28..af31a3800 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -279,7 +279,7 @@ - {% if iesg_state.slug != 'idexists' and iesg_state.slug != 'dead' and can_edit %} + {% if iesg_state.slug != 'idexists' and iesg_state.slug != 'dead' and can_edit or user|has_role:"Secretariat" %} Edit diff --git a/ietf/templates/doc/draft/change_state.html b/ietf/templates/doc/draft/change_state.html index 18d6dd083..3515c290e 100644 --- a/ietf/templates/doc/draft/change_state.html +++ b/ietf/templates/doc/draft/change_state.html @@ -1,5 +1,5 @@ {% extends "base.html" %} -{# Copyright The IETF Trust 2015, All Rights Reserved #} +{# Copyright The IETF Trust 2015-2023, All Rights Reserved #} {% load origin %} {% load django_bootstrap5 %} {% block title %}Change state for {{ doc }}{% endblock %} @@ -10,6 +10,13 @@
{{ doc }} + {% if state.slug == "dead" %} +

+ This document is in IESG state "Dead". It is unusual to change + this to anything other than "AD is watching", and this should + never be used as a replacement for Begin IESG Processing. +

+ {% endif %}
Help on states
From 7f074bf37f90b3483d65f8261087c050dff3e175 Mon Sep 17 00:00:00 2001 From: Robert Sparks Date: Thu, 7 Sep 2023 10:40:20 -0500 Subject: [PATCH 03/21] fix: avoid redirects in mailarchive links (#6282) --- ietf/templates/doc/document_draft.html | 2 +- ietf/templates/doc/search/search_form.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/ietf/templates/doc/document_draft.html b/ietf/templates/doc/document_draft.html index af31a3800..5ba39454a 100644 --- a/ietf/templates/doc/document_draft.html +++ b/ietf/templates/doc/document_draft.html @@ -684,7 +684,7 @@