Fix merge conflicts

src/registrar/context_processors.py

@@ -39,17 +39,6 @@ def is_production(request):
     return {"IS_PRODUCTION": settings.IS_PRODUCTION}
 
 
-def org_user_status(request):
-    if request.user.is_authenticated:
-        is_org_user = request.user.is_org_user(request)
-    else:
-        is_org_user = False
-
-    return {
-        "is_org_user": is_org_user,
-    }
-
-
 def add_path_to_context(request):
     return {"path": getattr(request, "path", None)}
 
@@ -68,13 +57,14 @@ def portfolio_permissions(request):
                 "has_domain_requests_portfolio_permission": False,
                 "portfolio": None,
                 "has_organization_feature_flag": False,
+                "is_org_user": False,
             }
         return {
             "has_base_portfolio_permission": request.user.has_base_portfolio_permission(),
             "has_domains_portfolio_permission": request.user.has_domains_portfolio_permission(),
             "has_domain_requests_portfolio_permission": request.user.has_domain_requests_portfolio_permission(),
-            "portfolio": request.user.portfolio,
             "has_organization_feature_flag": flag_is_active(request, "organization_feature"),
+            "is_org_user": request.user.is_org_user(request)
         }
     except AttributeError:
         # Handles cases where request.user might not exist

src/registrar/models/user.py

@@ -413,9 +413,9 @@ class User(AbstractUser):
         has_organization_feature_flag = flag_is_active(request, "organization_feature")
         return has_organization_feature_flag and self.has_base_portfolio_permission()
 
-    def get_user_domain_ids(self):
+    def get_user_domain_ids(self, request):
         """Returns either the domains ids associated with this user on UserDomainRole or Portfolio"""
-        if self.has_base_portfolio_permission() and self.has_view_all_domains_permission():
+        if self.is_org_user(request) and self.has_view_all_domains_permission():
             return DomainInformation.objects.filter(portfolio=self.portfolio).values_list("domain_id", flat=True)
         else:
             return UserDomainRole.objects.filter(user=self).values_list("domain_id", flat=True)

src/registrar/templates/includes/domains_table.html

@@ -2,7 +2,7 @@
 
 <section class="section--outlined domains{% if portfolio is not None %} margin-top-0{% endif %}" id="domains">
   <div class="section--outlined__header margin-bottom-3 {% if portfolio is None %} section--outlined__header--no-portfolio justify-content-space-between{% else %} grid-row{% endif %}">
-      {% if portfolio is None %}
+      {% if not portfolio %}
         <h2 id="domains-header" class="display-inline-block">Domains</h2>
         <span class="display-none" id="no-portfolio-js-flag"></span>
       {% else %}

src/registrar/utility/csv_export.py

@@ -580,7 +580,7 @@ class DomainDataTypeUser(DomainDataType):
             return Q(id__in=[])
         else:
             # Get all domains the user is associated with
-            return Q(domain__id__in=request.user.get_user_domain_ids())
+            return Q(domain__id__in=request.user.get_user_domain_ids(request))
 
 
 class DomainDataFull(DomainExport):

src/registrar/views/domains_json.py

@@ -1,20 +1,18 @@
 import logging
 from django.http import JsonResponse
 from django.core.paginator import Paginator
-from registrar.models import Domain
+from registrar.models import UserDomainRole, Domain, DomainInformation
 from django.contrib.auth.decorators import login_required
 from django.urls import reverse
 from django.db.models import Q
 
-from registrar.models import DomainInformation, UserDomainRole
-
 logger = logging.getLogger(__name__)
 
 
 @login_required
 def get_domains_json(request):
     """Given the current request,
-    get all domains that are associated with the User object"""
+    get all domains that are associated with the UserDomainRole object"""
 
     domain_ids = get_domain_ids_from_request(request)
 
@@ -51,7 +49,7 @@ def get_domain_ids_from_request(request):
     Otherwise, return domain ids associated with request.user.
     """
     portfolio = request.GET.get("portfolio")
-    if portfolio:
+    if portfolio and request.user.is_org_user(request):
         domain_infos = DomainInformation.objects.filter(portfolio=portfolio)
         return domain_infos.values_list("domain_id", flat=True)
     else:

src/registrar/views/index.py

@@ -5,9 +5,9 @@ def index(request):
     """This page is available to anyone without logging in."""
     context = {}
 
-    if request.user.is_authenticated:
+    if request and request.user and request.user.is_authenticated:
         # This controls the creation of a new domain request in the wizard
         request.session["new_request"] = True
-        context["user_domain_count"] = request.user.get_user_domain_ids().count()
+        context["user_domain_count"] = request.user.get_user_domain_ids(request).count()
 
     return render(request, "home.html", context)

src/registrar/views/portfolios.py

@@ -23,8 +23,8 @@ class PortfolioDomainsView(PortfolioDomainsPermissionView, View):
 
     def get(self, request):
         context = {}
-        if self.request.user.is_authenticated:
+        if self.request and self.request.user and self.request.user.is_authenticated:
-            context["user_domain_count"] = self.request.user.get_user_domain_ids().count()
+            context["user_domain_count"] = self.request.user.get_user_domain_ids(request).count()
         return render(request, "portfolio_domains.html", context)