This commit is contained in:
Rachid Mrad 2024-09-06 12:55:01 -04:00
commit 49e656082a
No known key found for this signature in database
5 changed files with 19 additions and 22 deletions

View file

@ -1219,7 +1219,7 @@ document.addEventListener('DOMContentLoaded', function() {
const expirationDateFormatted = expirationDate ? expirationDate.toLocaleDateString('en-US', options) : ''; const expirationDateFormatted = expirationDate ? expirationDate.toLocaleDateString('en-US', options) : '';
const expirationDateSortValue = expirationDate ? expirationDate.getTime() : ''; const expirationDateSortValue = expirationDate ? expirationDate.getTime() : '';
const actionUrl = domain.action_url; 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'); const row = document.createElement('tr');

View file

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

View file

@ -9,15 +9,9 @@
<main id="main-content" class="grid-container"> <main id="main-content" class="grid-container">
<div class="grid-col desktop:grid-offset-2 desktop:grid-col-8"> <div class="grid-col desktop:grid-offset-2 desktop:grid-col-8">
{% comment %} {% comment %}
The back button should redirect to the domain request page if we are in the portfolio view. TODO: Uncomment in #2596
Otherwise, lets just redirect back to home.
{% endcomment %}
{% if portfolio %} {% if portfolio %}
{% url 'domain-requests' as url %} {% 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"> <nav class="usa-breadcrumb padding-top-0" aria-label="Domain request breadcrumb">
<ol class="usa-breadcrumb__list"> <ol class="usa-breadcrumb__list">
<li class="usa-breadcrumb__list-item"> <li class="usa-breadcrumb__list-item">
@ -29,7 +23,8 @@
</li> </li>
</ol> </ol>
</nav> </nav>
{% else %} {% else %}{% endcomment %}
{% url 'home' as url %}
<a href="{{ url }}" class="breadcrumb__back"> <a href="{{ url }}" class="breadcrumb__back">
<svg class="usa-icon" aria-hidden="true" focusable="false" role="img"> <svg class="usa-icon" aria-hidden="true" focusable="false" role="img">
<use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use> <use xlink:href="{% static 'img/sprite.svg' %}#arrow_back"></use>
@ -39,7 +34,7 @@
Back to manage your domains Back to manage your domains
</p> </p>
</a> </a>
{% endif %} {% comment %} {% endif %}{% endcomment %}
<h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1> <h1>Domain request for {{ DomainRequest.requested_domain.name }}</h1>
<div <div
class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2" class="usa-summary-box dotgov-status-box margin-top-3 padding-left-2"

View file

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

View file

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