Fix merge conflicts pt 2

This commit is contained in:
zandercymatics 2024-08-02 09:40:48 -06:00
parent 0814b86227
commit a8b362e32e
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 2 additions and 9 deletions

View file

@ -39,14 +39,6 @@ def is_production(request):
return {"IS_PRODUCTION": settings.IS_PRODUCTION}
def add_path_to_context(request):
return {"path": getattr(request, "path", None)}
def add_has_profile_feature_flag_to_context(request):
return {"has_profile_feature_flag": flag_is_active(request, "profile_feature")}
def org_user_status(request):
if request.user.is_authenticated:
is_org_user = request.user.is_org_user(request)
@ -73,6 +65,7 @@ def portfolio_permissions(request):
"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"),
}
except AttributeError: