zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-21 10:16:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Fix edge cases for review page and add fields to admin

Browse source
This commit is contained in:
zandercymatics 2024-10-23 13:54:53 -06:00
parent 0374efb778
commit 939b11ecee
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 14 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/registrar/admin.py
View file

@ -1748,6 +1748,9 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"fields": [ "fields": [
"portfolio", "portfolio",
"sub_organization", "sub_organization",
"requested_suborganization",
"suborganization_city",
"suborganization_state_territory",
"status_history", "status_history",
"status", "status",
"rejection_reason", "rejection_reason",

14
src/registrar/templates/includes/portfolio_request_review_steps.html
View file

@ -8,16 +8,24 @@
{% endif %} {% endif %}
{% if step == Step.REQUESTING_ENTITY %} {% 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 %} {% 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 %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
<p class="margin-top-0 margin-bottom-0">{{domain_request.suborganization_city}}, {{domain_request.suborganization_state_territory}}</p>
{% endwith %} {% endwith %}
<p class="margin-top-0 margin-bottom-0">{{domain_request.suborganization_city}}, {{domain_request.suborganization_state_territory}}</p>
{% else %} {% else %}
{% with title=form_titles|get_item:step value="<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %} {% with title=form_titles|get_item:step value="<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %} {% endwith %}
{% endif%} {% endif %}
{% endif %} {% endif %}
{% if step == Step.CURRENT_SITES %} {% if step == Step.CURRENT_SITES %}