Merge pull request #2533 from cisagov/dk/2379-hotfix

Issue #2379: Hotfix for portfolio waffle flag not being checked in all templates

src/registrar/context_processors.py

@@ -61,7 +61,7 @@ def add_has_profile_feature_flag_to_context(request):
 def portfolio_permissions(request):
     """Make portfolio permissions for the request user available in global context"""
     try:
-        if not request.user or not request.user.is_authenticated:
+        if not request.user or not request.user.is_authenticated or not flag_is_active(request, "organization_feature"):
             return {
                 "has_base_portfolio_permission": False,
                 "has_domains_portfolio_permission": False,
@@ -74,7 +74,7 @@ def portfolio_permissions(request):
             "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"),
+            "has_organization_feature_flag": True,
         }
     except AttributeError:
         # Handles cases where request.user might not exist