diff --git a/src/registrar/assets/js/get-gov.js b/src/registrar/assets/js/get-gov.js index d216de49a..aa186dc31 100644 --- a/src/registrar/assets/js/get-gov.js +++ b/src/registrar/assets/js/get-gov.js @@ -1219,7 +1219,7 @@ document.addEventListener('DOMContentLoaded', function() { const expirationDateFormatted = expirationDate ? expirationDate.toLocaleDateString('en-US', options) : ''; const expirationDateSortValue = expirationDate ? expirationDate.getTime() : ''; const actionUrl = domain.action_url; - const suborganization = domain.suborganization ? domain.suborganization : '⎯'; + const suborganization = domain.domain_info__sub_organization ? domain.domain_info__sub_organization : '⎯'; const row = document.createElement('tr'); diff --git a/src/registrar/templates/domain_request_form.html b/src/registrar/templates/domain_request_form.html index 486cacfaa..9228e51db 100644 --- a/src/registrar/templates/domain_request_form.html +++ b/src/registrar/templates/domain_request_form.html @@ -16,6 +16,8 @@ Previous step + {% comment %} + TODO: uncomment in #2596 {% else %} {% if portfolio %} {% url 'domain-requests' as url_2 %} @@ -33,7 +35,7 @@ - {% endif %} + {% endif %} {% endcomment %} {% endif %} {% block form_messages %} diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html index c2cb45ede..f4defc14e 100644 --- a/src/registrar/templates/domain_request_status.html +++ b/src/registrar/templates/domain_request_status.html @@ -9,15 +9,9 @@
{% comment %} - The back button should redirect to the domain request page if we are in the portfolio view. - Otherwise, lets just redirect back to home. - {% endcomment %} + TODO: Uncomment in #2596 {% if portfolio %} {% url 'domain-requests' as url %} - {% else %} - {% url 'home' as url %} - {% endif %} - {% if portfolio %} - {% else %} - - - -

- Back to manage your domains -

-
- {% endif %} + {% else %}{% endcomment %} + {% url 'home' as url %} + + + +

+ Back to manage your domains +

+
+ {% comment %} {% endif %}{% endcomment %}

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

Expires Status {% if portfolio and has_view_suborganization_portfolio_permission %} - Suborganization + Suborganization {% endif %}