diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index 1edc87a4b..eaccfcee9 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -673,7 +673,7 @@ class DomainRequest(TimeStampedModel): 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. diff --git a/src/registrar/templates/includes/domain_request_status_manage.html b/src/registrar/templates/includes/domain_request_status_manage.html index 5f6c53d50..5ce44a8fa 100644 --- a/src/registrar/templates/includes/domain_request_status_manage.html +++ b/src/registrar/templates/includes/domain_request_status_manage.html @@ -146,7 +146,7 @@ {% 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 %} @@ -164,7 +164,7 @@ {% 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 %} @@ -173,7 +173,7 @@ {% 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 %} diff --git a/src/registrar/templates/includes/request_review_steps.html b/src/registrar/templates/includes/request_review_steps.html index ccdb5dc12..dd2c961e5 100644 --- a/src/registrar/templates/includes/request_review_steps.html +++ b/src/registrar/templates/includes/request_review_steps.html @@ -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:"Incomplete"|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:"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 %} {% else %} @@ -29,7 +29,7 @@ {% if step == Step.ORGANIZATION_FEDERAL %} - {% with title=form_titles|get_item:step value=domain_request.get_federal_type_display|default:"Incomplete"|safe %} + {% with title=form_titles|get_item:step value=domain_request.converted_federal_type|default:"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 %} @@ -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 %} diff --git a/src/registrar/templates/includes/request_status_manage.html b/src/registrar/templates/includes/request_status_manage.html index 5f6c53d50..2201d3030 100644 --- a/src/registrar/templates/includes/request_status_manage.html +++ b/src/registrar/templates/includes/request_status_manage.html @@ -146,7 +146,7 @@ {% 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 %} @@ -173,7 +173,7 @@ {% 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 %}