From cbe0eaf00a2ce43d14a3cc061582e747f61fe744 Mon Sep 17 00:00:00 2001
From: russhousley <housley@vigilsec.com>
Date: Tue, 15 Mar 2022 19:08:16 -0400
Subject: [PATCH 1/2] Allow AD and Secretariat to update the people to notify
 about conflict-reviewss until the are announced. Fixes #3639.

---
 ietf/templates/doc/document_conflict_review.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 3e39a32d9f4..20a0ac64165 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -105,7 +105,7 @@
                 <td></td>
                 <th>Send notices to</th>
                 <td class="edit">
-                    {% if not snapshot and user|has_role:"Area Director,Secretariat" and doc.get_state_slug not in approved_states %}
+                    {% if not snapshot and user|has_role:"Area Director,Secretariat" and not doc.get_state_slug == 'appr-noprob-sent' and not doc.get_state_slug == 'appr-reqnopub-sent' %}
                         <a class="btn btn-primary btn-sm float-end"
                            href="{% url 'ietf.doc.views_doc.edit_notify;conflict-review' name=doc.name %}">
                             Edit

From 5d463b4a2c8b85b9a75c5b498603fad6f19c9b91 Mon Sep 17 00:00:00 2001
From: russhousley <housley@vigilsec.com>
Date: Wed, 16 Mar 2022 15:13:37 -0400
Subject: [PATCH 2/2] fix: Allow notify list for conflict-review changes in any
 state

---
 ietf/templates/doc/document_conflict_review.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ietf/templates/doc/document_conflict_review.html b/ietf/templates/doc/document_conflict_review.html
index 20a0ac64165..46f8d207e03 100644
--- a/ietf/templates/doc/document_conflict_review.html
+++ b/ietf/templates/doc/document_conflict_review.html
@@ -105,7 +105,7 @@
                 <td></td>
                 <th>Send notices to</th>
                 <td class="edit">
-                    {% if not snapshot and user|has_role:"Area Director,Secretariat" and not doc.get_state_slug == 'appr-noprob-sent' and not doc.get_state_slug == 'appr-reqnopub-sent' %}
+                    {% if not snapshot and user|has_role:"Area Director,Secretariat" %}
                         <a class="btn btn-primary btn-sm float-end"
                            href="{% url 'ietf.doc.views_doc.edit_notify;conflict-review' name=doc.name %}">
                             Edit