From 0dbcb749a6c754a9fe724dcd36a6e2496473b8d5 Mon Sep 17 00:00:00 2001
From: David Kennedy <david.kennedy@associates.cisa.dhs.gov>
Date: Mon, 23 Oct 2023 21:47:23 -0400
Subject: [PATCH] fixed cancel button on nameservers

---
 .../templates/domain_nameservers.html          | 18 ++++++++----------
 src/registrar/views/domain.py                  |  4 +++-
 2 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/src/registrar/templates/domain_nameservers.html b/src/registrar/templates/domain_nameservers.html
index f03570218..eebba921d 100644
--- a/src/registrar/templates/domain_nameservers.html
+++ b/src/registrar/templates/domain_nameservers.html
@@ -76,16 +76,14 @@
             class="usa-button"
         >Save
       </button>
+
+      <button
+            type="submit"
+            class="usa-button usa-button--outline"
+            name="btn-cancel-click"
+            aria-label="Reset the data in the Name Server form to the registry state (undo changes)"
+        >Cancel
+      </button>
     </div>
   </form>
-
-  <form aria-label="form to undo changes to the Name Servers">
-    <button
-          type="submit"
-          class="usa-button usa-button--outline btn-cancel"
-          name="btn-cancel-click"
-          aria-label="Reset the data in the Name Server form to the registry state (undo changes)"
-      >Cancel
-    </button>
-  </form>
 {% endblock %}  {# domain_content #}
diff --git a/src/registrar/views/domain.py b/src/registrar/views/domain.py
index 4d977891d..36ac74f94 100644
--- a/src/registrar/views/domain.py
+++ b/src/registrar/views/domain.py
@@ -10,6 +10,7 @@ import logging
 from django.contrib import messages
 from django.contrib.messages.views import SuccessMessageMixin
 from django.db import IntegrityError
+from django.http import HttpResponseRedirect
 from django.shortcuts import redirect
 from django.template import RequestContext
 from django.urls import reverse
@@ -272,7 +273,8 @@ class DomainNameserversView(DomainFormBaseView, BaseFormSet):
         formset = self.get_form()
         
         if "btn-cancel-click" in request.POST:
-            return redirect("/", {"formset": formset}, RequestContext(request))
+            url = self.get_success_url()
+            return HttpResponseRedirect(url)
         
         if formset.is_valid():
             return self.form_valid(formset)