zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-22 09:11:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into za/2352-portfolio-user-can-view-and-update-suborgs

Browse source
This commit is contained in:
zandercymatics 2024-08-02 13:41:34 -06:00
commit 7b811895b3
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
28 changed files with 655 additions and 127 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/context_processors.py
View file

@ -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,
@ -76,7 +76,7 @@ def portfolio_permissions(request):
"has_domain_requests_portfolio_permission": request.user.has_domain_requests_portfolio_permission(),
"has_edit_org_portfolio_permission": request.user.has_edit_org_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