From 436809f71152992dead4c2d0e11f906042668eb5 Mon Sep 17 00:00:00 2001
From: asaki222 <asaki444@gmail.com>
Date: Fri, 18 Oct 2024 12:33:08 -0400
Subject: [PATCH] currrent thing

---
 src/registrar/admin.py                           |  5 +++--
 src/registrar/models/domain_request.py           | 16 ++++++++++++++++
 .../includes/domain_request_status_manage.html   |  2 +-
 .../templates/includes/organization_address.html |  4 ++--
 .../templates/includes/request_review_steps.html |  2 +-
 .../includes/request_status_manage.html          |  2 +-
 6 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 0b96b4c48..f6f3cd2a5 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1694,14 +1694,15 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "last_submitted_date",
         "last_status_update",
         "status",
-        "generic_org_type",
         "federal_type",
         "federal_agency",
-        "organization_name",
         "custom_election_board",
         "city",
         "state_territory",
         "investigator",
+        "get_generic_org_type",
+        "get_organization_name",
+        "organization_name"
     ]
 
     orderable_fk_fields = [
diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py
index b9e3315d5..7806c18e2 100644
--- a/src/registrar/models/domain_request.py
+++ b/src/registrar/models/domain_request.py
@@ -1334,3 +1334,19 @@ class DomainRequest(TimeStampedModel):
         if not is_complete or not self._is_general_form_complete(request):
             return False
         return True
+    
+    @property
+    def get_organization_name(self):
+        """"returns the organization field if the domain request is in a portfolio
+        otherwise it returns the organization name from the domain request object itself"""
+        if self.portfolio:
+            return self.portfolio.organization_name
+        return self.organization_name
+    
+    @property
+    def get_generic_org_type(self):
+        """"returns the organization type if the domain request is in a portfolio
+        otherwise it returns the organization type from the domain request object itself"""
+        if self.portfolio:
+            return self.portfolio.organization_type
+        return self.generic_org_type
\ No newline at end of file
diff --git a/src/registrar/templates/includes/domain_request_status_manage.html b/src/registrar/templates/includes/domain_request_status_manage.html
index 2a254df4b..5f6c53d50 100644
--- a/src/registrar/templates/includes/domain_request_status_manage.html
+++ b/src/registrar/templates/includes/domain_request_status_manage.html
@@ -173,7 +173,7 @@
             {% endwith %}
         {% endif %}
 
-        {% if DomainRequest.organization_name %}
+        {% if DomainRequest.get_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
index d6126d681..3c2cacaa2 100644
--- a/src/registrar/templates/includes/organization_address.html
+++ b/src/registrar/templates/includes/organization_address.html
@@ -2,8 +2,8 @@
     {% if  organization.federal_agency  %}
         {{ organization.federal_agency }}<br />
     {% endif %}
-    {% if  organization.organization_name  %}
-        {{ organization.organization_name }}
+    {% if  organization.get_organization_name  %}
+        {{ organization.get_organization_name  }}
     {% endif %}
     {% if  organization.address_line1  %}
         <br />{{ organization.address_line1 }}
diff --git a/src/registrar/templates/includes/request_review_steps.html b/src/registrar/templates/includes/request_review_steps.html
index db1743b34..ccdb5dc12 100644
--- a/src/registrar/templates/includes/request_review_steps.html
+++ b/src/registrar/templates/includes/request_review_steps.html
@@ -41,7 +41,7 @@
     {% endif %}
 
     {% if step == Step.ORGANIZATION_CONTACT %}
-        {% if domain_request.organization_name %}
+        {% if domain_request.get_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 2a254df4b..5f6c53d50 100644
--- a/src/registrar/templates/includes/request_status_manage.html
+++ b/src/registrar/templates/includes/request_status_manage.html
@@ -173,7 +173,7 @@
             {% endwith %}
         {% endif %}
 
-        {% if DomainRequest.organization_name %}
+        {% if DomainRequest.get_organization_name %}
             {% include "includes/summary_item.html" with title='Organization' value=DomainRequest  address='true' heading_level=heading_level %}
         {% endif %}