Fix merge conflicts

This commit is contained in:
zandercymatics 2024-08-02 09:05:47 -06:00
parent dc70758603
commit 2769a9e5ba
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
7 changed files with 13 additions and 25 deletions

View file

@ -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