diff --git a/src/registrar/templates/domain_request_form.html b/src/registrar/templates/domain_request_form.html index 17948a110..486cacfaa 100644 --- a/src/registrar/templates/domain_request_form.html +++ b/src/registrar/templates/domain_request_form.html @@ -16,6 +16,24 @@ Previous step + {% else %} + {% if portfolio %} + {% url 'domain-requests' as url_2 %} + + {% endif %} {% endif %} {% block form_messages %} diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html index 40722c41e..c2cb45ede 100644 --- a/src/registrar/templates/domain_request_status.html +++ b/src/registrar/templates/domain_request_status.html @@ -13,23 +13,33 @@ Otherwise, lets just redirect back to home. {% endcomment %} {% if portfolio %} - {% url 'domain-requests' as url%} + {% url 'domain-requests' as url %} {% else %} - {% url 'home' as url%} + {% url 'home' as url %} + {% endif %} + {% if portfolio %} + + {% else %} + + + +

+ Back to manage your domains +

+
{% endif %} - - - -

- {% if portfolio %} - Back to manage your domains requests - {% else %} - Back to manage your domains - {% endif %} -

-

Domain request for {{ DomainRequest.requested_domain.name }}

Submit request" @@ -418,6 +422,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): You’ll only be able to withdraw your request.", "review_form_is_complete": True, "user": self.request.user, + "requested_domain__name": requested_domain_name, } else: # form is not complete modal_button = '' @@ -433,6 +438,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): Return to the request and visit the steps that are marked as "incomplete."', "review_form_is_complete": False, "user": self.request.user, + "requested_domain__name": requested_domain_name, } return context_stuff @@ -512,7 +518,10 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): # if user opted to save progress and return, # return them to the home page if button == "save_and_return": - return HttpResponseRedirect(reverse("home")) + if request.user.is_org_user(request): + return HttpResponseRedirect(reverse("domain-requests")) + else: + return HttpResponseRedirect(reverse("home")) # otherwise, proceed as normal return self.goto_next_step() @@ -781,7 +790,10 @@ class DomainRequestWithdrawn(DomainRequestPermissionWithdrawView): domain_request = DomainRequest.objects.get(id=self.kwargs["pk"]) domain_request.withdraw() domain_request.save() - return HttpResponseRedirect(reverse("home")) + if self.request.user.is_org_user(self.request): + return HttpResponseRedirect(reverse("domain-requests")) + else: + return HttpResponseRedirect(reverse("home")) class DomainRequestDeleteView(DomainRequestPermissionDeleteView):