Skip to content

Commit

Permalink
added missing parts of the converted methods
Browse files Browse the repository at this point in the history
  • Loading branch information
asaki222 committed Oct 21, 2024
1 parent 32183a2 commit e69a296
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
2 changes: 1 addition & 1 deletion src/registrar/models/domain_request.py
Original file line number Diff line number Diff line change
Expand Up @@ -673,7 +673,7 @@ def save(self, *args, **kwargs):
def send_custom_status_update_email(self, status):
"""Helper function to send out a second status email when the status remains the same,
but the reason has changed."""

# Currently, we store all this information in three variables.
# When adding new reasons, this can be a lot to manage so we store it here
# in a centralized location. However, this may need to change if this scales.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>

{% block request_summary %}
{% with heading_level='h3' %}
{% with org_type=DomainRequest.get_generic_org_type_display %}
{% with org_type=DomainRequest.converted_generic_org_type %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}

Expand All @@ -164,7 +164,7 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>
{% endif %}

{% if DomainRequest.get_federal_type_display %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.converted_federal_type heading_level=heading_level %}
{% endif %}

{% if DomainRequest.is_election_board %}
Expand All @@ -173,7 +173,7 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>
{% endwith %}
{% endif %}

{% if DomainRequest.get_organization_name %}
{% if DomainRequest.converted_organization_name %}
{% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}

Expand Down
8 changes: 4 additions & 4 deletions src/registrar/templates/includes/request_review_steps.html
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@
{% endif %}

{% if step == Step.ORGANIZATION_TYPE %}
{% if domain_request.generic_org_type is not None %}
{% with title=form_titles|get_item:step value=domain_request.get_generic_org_type_display|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
{% if domain_request.converted_generic_org_type is not None %}
{% with title=form_titles|get_item:step value=domain_request.converted_generic_org_type_display|default:"<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 %}
{% endwith %}
{% else %}
Expand All @@ -29,7 +29,7 @@


{% if step == Step.ORGANIZATION_FEDERAL %}
{% with title=form_titles|get_item:step value=domain_request.get_federal_type_display|default:"<span class='text-bold text-secondary-dark'>Incomplete</span>"|safe %}
{% with title=form_titles|get_item:step value=domain_request.converted_federal_type|default:"<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 %}
{% endwith %}
{% endif %}
Expand All @@ -41,7 +41,7 @@
{% endif %}

{% if step == Step.ORGANIZATION_CONTACT %}
{% if domain_request.get_organization_name %}
{% if domain_request.converted_organization_name %}
{% with title=form_titles|get_item:step value=domain_request %}
{% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url address='true' %}
{% endwith %}
Expand Down
4 changes: 2 additions & 2 deletions src/registrar/templates/includes/request_status_manage.html
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>

{% block request_summary %}
{% with heading_level='h3' %}
{% with org_type=DomainRequest.get_generic_org_type_display %}
{% with org_type=DomainRequest.converted_generic_org_type_display %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}

Expand All @@ -173,7 +173,7 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>
{% endwith %}
{% endif %}

{% if DomainRequest.get_organization_name %}
{% if DomainRequest.converted_organization_name %}
{% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}

Expand Down

0 comments on commit e69a296

Please sign in to comment.