From cd56d43736722921cc005867db98739bdf905de8 Mon Sep 17 00:00:00 2001
From: Paul Selkirk <paul@painless-security.com>
Date: Tue, 5 Sep 2023 13:58:56 -0400
Subject: [PATCH] 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 <rjsparks@nostrum.com>
---
 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 @@
                         </a>
                     </th>
                     <td class="edit">
-                        {% 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" %}
                             <a class="btn btn-primary btn-sm"
                                href="{% url 'ietf.doc.views_draft.change_state' name=doc.name %}">
                                 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 @@
         <br>
         <small class="text-body-secondary">{{ doc }}</small>
     </h1>
+    {% if state.slug == "dead" %}
+        <p class="alert alert-warning my-3">
+           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.
+        </p>
+    {% endif %}
     <a class="btn btn-info my-3"
        href="{% url 'ietf.doc.views_help.state_help' type="draft-iesg" %}">Help on states</a>
     <form class="mt-3" method="post">