updated to request view

cisagov · Oct 30, 2024 · a3b5e2c · a3b5e2c
1 parent 73f4d80
commit a3b5e2c
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 24 deletions.
diff --git a/src/registrar/templates/includes/domain_request_status_manage.html b/src/registrar/templates/includes/domain_request_status_manage.html
@@ -163,8 +163,8 @@ <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 %}
+        {% if DomainRequest.converted_federal_type %}
+            {% 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 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>
             {% endwith %}
         {% endif %}
 
-        {% if DomainRequest.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/organization_address.html b/src/registrar/templates/includes/organization_address.html
@@ -1,28 +1,28 @@
 <address>
-    {% if  organization.federal_agency  %}
-        {{ organization.federal_agency }}<br />
+    {% if  organization.converted_federal_agency  %}
+        {{ organization.converted_federal_agency }}<br />
     {% endif %}
-    {% if  organization.organization_name  %}
-        {{ organization.organization_name }}
+    {% if  organization.converted_organization_name  %}
+        {{ organization.converted_organization_name }}
     {% endif %}
-    {% if  organization.address_line1  %}
-        <br />{{ organization.address_line1 }}
+    {% if  organization.converted_address_line1  %}
+        <br />{{ organization.converted_address_line1 }}
     {% endif %}
-    {% if  organization.address_line2  %}
-        <br />{{ organization.address_line2 }}
+    {% if  organization.converted_address_line2  %}
+        <br />{{ organization.converted_address_line2 }}
     {% endif %}
-    {% if  organization.city  %}
-        <br />{{ organization.city }}{% if organization.state_territory %},&nbsp;
+    {% if  organization.converted_city  %}
+        <br />{{ organization.converted_city }}{% if organization.converted_state_territory %},&nbsp;
         {% else %}<br />
         {% endif %}
     {% endif %}
-    {% if  organization.state_territory  %}
-        {{ organization.state_territory }}
+    {% if  organization.converted_state_territory  %}
+        {{ organization.converted_state_territory }}
     {% endif %}
-    {% if  organization.zipcode  %}
-        <br />{{ organization.zipcode }}
+    {% if  organization.converted_zipcode  %}
+        <br />{{ organization.converted_zipcode }}
     {% endif %}
-    {% if  organization.urbanization  %}
-        <br />{{ organization.urbanization }}
+    {% if  organization.converted_urbanization  %}
+        <br />{{ organization.converted_urbanization }}
     {% endif %}
 </address>
diff --git a/src/registrar/templates/includes/request_status_manage.html b/src/registrar/templates/includes/request_status_manage.html
@@ -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 %}
 
@@ -163,8 +163,8 @@ <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 %}
+        {% if DomainRequest.converted_federal_type %}
+            {% 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,8 +173,8 @@ <h2 class="text-primary-darker"> Summary of your domain request </h2>
             {% endwith %}
         {% endif %}
 
-        {% if DomainRequest.organization_name %}
-            {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' heading_level=heading_level %}
+        {% if DomainRequest.converted_organization_name %}
+            {% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
         {% endif %}
 
         {% if DomainRequest.about_your_organization %}