From 74927fd1f7e86d9db5359a5830cd91cfafe7adbf Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Fri, 26 Jul 2024 11:04:57 -0600
Subject: [PATCH] Fix logic after pulling from latest

---
 src/registrar/templates/domain_detail.html          | 2 +-
 src/registrar/templates/domain_sidebar.html         | 2 +-
 src/registrar/templates/includes/domains_table.html | 2 +-
 src/registrar/tests/test_views_domain.py            | 8 ++++++++
 4 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/src/registrar/templates/domain_detail.html b/src/registrar/templates/domain_detail.html
index 0d129c69c..711c3ac2a 100644
--- a/src/registrar/templates/domain_detail.html
+++ b/src/registrar/templates/domain_detail.html
@@ -53,7 +53,7 @@
       {% endif %}
     {% endif %}
 
-    {% if portfolio %}
+    {% if is_org_user %}
       {% comment %} TODO - uncomment in #2352 and add to edit_link
       {% url 'domain-suborganization' pk=domain.id as url %}
       {% endcomment %}
diff --git a/src/registrar/templates/domain_sidebar.html b/src/registrar/templates/domain_sidebar.html
index efc863634..a4b6d85cb 100644
--- a/src/registrar/templates/domain_sidebar.html
+++ b/src/registrar/templates/domain_sidebar.html
@@ -8,7 +8,7 @@
         {% include "includes/domain_sidenav_item.html" with item_text="Domain overview" %}
       {% endwith %}
 
-      {% if portfolio %}
+      {% if is_org_user %}
         {% comment %} TODO - uncomment in #2352
           {% with url_name="domain-suborganization" %}
             {% include "includes/domain_sidenav_item.html" with item_text="Suborganization" %}
diff --git a/src/registrar/templates/includes/domains_table.html b/src/registrar/templates/includes/domains_table.html
index 3a7aee80b..cef3c61a4 100644
--- a/src/registrar/templates/includes/domains_table.html
+++ b/src/registrar/templates/includes/domains_table.html
@@ -143,7 +143,7 @@
             <th data-sortable="expiration_date" scope="col" role="columnheader">Expires</th>
             <th data-sortable="state_display" scope="col" role="columnheader">Status</th>
             <!-- Use portfolio_base_permission when merging into 2366 then delete this comment -->
-            {% if portfolio %}
+            {% if is_org_user %}
               <th data-sortable="suborganization" scope="col" role="columnheader">Suborganization</th>
             {% endif %}
             <th 
diff --git a/src/registrar/tests/test_views_domain.py b/src/registrar/tests/test_views_domain.py
index f3115264f..081ddaa33 100644
--- a/src/registrar/tests/test_views_domain.py
+++ b/src/registrar/tests/test_views_domain.py
@@ -1112,10 +1112,18 @@ class TestDomainSeniorOfficial(TestDomainOverview):
         # Add a portfolio to the current domain
         portfolio = Portfolio.objects.create(creator=self.user, organization_name="Ice Cream")
         Suborganization.objects.create(portfolio=portfolio, name="Vanilla")
+
+        # Add the portfolio to the domain_information object
         self.domain_information.portfolio = portfolio
         self.domain_information.save()
         self.domain_information.refresh_from_db()
 
+        # Add portfolio perms to the user object
+        self.user.portfolio = portfolio
+        self.user.portfolio_additional_permissions = [User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO]
+        self.user.save()
+        self.user.refresh_from_db()
+
         # Add a SO to the portfolio
         senior_official = SeniorOfficial.objects.create(first_name="Bob", last_name="Unoriginal")
         portfolio.senior_official = senior_official