merge

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');
 

src/registrar/templates/domain_request_form.html

@@ -16,6 +16,8 @@
             <use xlink:href="{%static 'img/sprite.svg'%}#arrow_back"></use>
           </svg><span class="margin-left-05">Previous step</span>
         </a>
+        {% comment %}
+        TODO: uncomment in #2596
         {% else %}
           {% if portfolio %}
             {% url 'domain-requests' as url_2 %}
@@ -33,7 +35,7 @@
                 </li>
               </ol>
             </nav>
-          {% endif %}
+          {% endif %} {% endcomment %}
         {% endif %}
 
 {% block form_messages %}

src/registrar/templates/domain_request_status.html

@@ -9,15 +9,9 @@
 <main id="main-content" class="grid-container">
   <div class="grid-col desktop:grid-offset-2 desktop:grid-col-8">
     {% 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 %}
       <nav class="usa-breadcrumb padding-top-0" aria-label="Domain request breadcrumb">
         <ol class="usa-breadcrumb__list">
           <li class="usa-breadcrumb__list-item">
@@ -29,17 +23,18 @@
           </li>
         </ol>
       </nav>
-    {% else %}
-      <a href="{{ url }}" class="breadcrumb__back">
-        <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
-        <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
-        </svg>
-    
-        <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
-          Back to manage your domains
-        </p>
-      </a>
-    {% endif %}
+    {% else %}{% endcomment %}
+    {% url 'home' as url %}
+    <a href="{{ url }}" class="breadcrumb__back">
+      <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
+      <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
+      </svg>
+  
+      <p class="margin-left-05 margin-top-0 margin-bottom-0 line-height-sans-1">
+        Back to manage your domains
+      </p>
+    </a>
+    {% comment %} {% endif %}{% endcomment %}
     <h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1>
     <div
         class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2" 

src/registrar/templates/includes/domains_table.html

@@ -157,7 +157,7 @@
             <th data-sortable="expiration_date" scope="col" role="columnheader">Expires</th>
             <th data-sortable="state_display" scope="col" role="columnheader">Status</th>
             {% if portfolio and has_view_suborganization_portfolio_permission %}
-              <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
+              <th data-sortable="domain_info__sub_organization" scope="col" role="columnheader">Suborganization</th>
             {% endif %}
             <th 
               scope="col" 

src/registrar/views/domains_json.py

@@ -133,5 +133,5 @@ def serialize_domain(domain, user):
         "action_url": reverse("domain", kwargs={"pk": domain.id}),
         "action_label": ("View" if view_only else "Manage"),
         "svg_icon": ("visibility" if view_only else "settings"),
-        "suborganization": suborganization_name,
+        "domain_info__sub_organization": suborganization_name,
     }