diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 0b96b4c48..a4117e232 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1748,6 +1748,9 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): "fields": [ "portfolio", "sub_organization", + "requested_suborganization", + "suborganization_city", + "suborganization_state_territory", "status_history", "status", "rejection_reason", diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html index dd0099ec7..3f00f911c 100644 --- a/src/registrar/templates/includes/portfolio_request_review_steps.html +++ b/src/registrar/templates/includes/portfolio_request_review_steps.html @@ -8,16 +8,24 @@ {% endif %} {% if step == Step.REQUESTING_ENTITY %} - {% if domain_request.requested_suborganization and domain_request.suborganization_city and domain_request.suborganization_state_territory %} + {% if domain_request.portfolio and domain_request.organization_name == domain_request.portfolio.organization_name %} + {% with title=form_titles|get_item:step value=domain_request.portfolio.organization_name %} + {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} + {% endwith %} + {% elif domain_request.sub_organization %} + {% with title=form_titles|get_item:step value=domain_request.sub_organization %} + {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} + {% endwith %} + {% elif domain_request.requested_suborganization and domain_request.suborganization_city and domain_request.suborganization_state_territory %} {% with title=form_titles|get_item:step value=domain_request.requested_suborganization %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} -

{{domain_request.suborganization_city}}, {{domain_request.suborganization_state_territory}}

{% endwith %} +

{{domain_request.suborganization_city}}, {{domain_request.suborganization_state_territory}}

{% else %} {% with title=form_titles|get_item:step value="Incomplete"|safe %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} {% endwith %} - {% endif%} + {% endif %} {% endif %} {% if step == Step.CURRENT_SITES %}