From 707e5a21eacf19d606d9ff86acffeaeb5f0909e2 Mon Sep 17 00:00:00 2001
From: Rebecca Hsieh <rebecca.hsieh@truss.works>
Date: Thu, 30 May 2024 12:59:40 -0700
Subject: [PATCH] Removing post form for certain situations

---
 src/.pa11yci                                |  3 ---
 src/registrar/templates/includes/modal.html | 14 ++++++++++----
 src/registrar/views/domain_request.py       |  7 +++----
 3 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/src/.pa11yci b/src/.pa11yci
index ecca42a34..56ea40416 100644
--- a/src/.pa11yci
+++ b/src/.pa11yci
@@ -21,8 +21,5 @@
         "http://localhost:8080/request/requirements/",
         "http://localhost:8080/request/finished/",
         "http://localhost:8080/user-profile/"
-    ],
-    "ignore": [
-        "WCAG2AA.Principle2.Guideline2_2.2_2_1.H91"
     ]
 }
diff --git a/src/registrar/templates/includes/modal.html b/src/registrar/templates/includes/modal.html
index cb99fa321..b0b316a2f 100644
--- a/src/registrar/templates/includes/modal.html
+++ b/src/registrar/templates/includes/modal.html
@@ -18,12 +18,18 @@
 
         <div class="usa-modal__footer">
             <ul class="usa-button-group">
+                {% if not_form %}
                 <li class="usa-button-group__item">
-                    <form method="post">
-                        {% csrf_token %}
                         {{ modal_button }}
-                    </form>
-                </li>
+                </li>      
+                {% else %}
+                    <li class="usa-button-group__item">
+                        <form method="post">
+                            {% csrf_token %}
+                            {{ modal_button }}
+                        </form>
+                    </li>
+                {% endif %}
                 <li class="usa-button-group__item">
                     {% comment %} The cancel button the DS form actually triggers a context change in the view,
                     in addition to being a close modal hook {% endcomment %}
diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py
index 8d780e9dc..1b61ad498 100644
--- a/src/registrar/views/domain_request.py
+++ b/src/registrar/views/domain_request.py
@@ -386,6 +386,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
         if DomainRequest._form_complete(self.domain_request):
             modal_button = '<button type="submit" ' 'class="usa-button" ' ">Submit request</button>"
             context_stuff = {
+                "not_form": False,
                 "form_titles": self.TITLES,
                 "steps": self.steps,
                 "visited": self.storage.get("step_history", []),
@@ -401,11 +402,9 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
                 "user": self.request.user,
             }
         else:  # form is not complete
-            modal_button = (
-                "<!-- pa11y-ignore-next-line WCAG2AA.Principle2.Guideline2_2.2_2_1.H91 -->"
-                '<button type="button" class="usa-button" data-close-modal>Return to request</button>'
-            )
+            modal_button = '<button type="button" class="usa-button" data-close-modal>Return to request</button>'
             context_stuff = {
+                "not_form": True,
                 "form_titles": self.TITLES,
                 "steps": self.steps,
                 "visited": self.storage.get("step_history", []),