fixed unit tests, updated context processor

This commit is contained in:
David Kennedy 2024-07-18 12:31:13 -04:00
parent 1b25be8d96
commit 51509e8b13
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
2 changed files with 21 additions and 13 deletions

View file

@ -42,20 +42,28 @@ def is_production(request):
def portfolio_permissions(request):
"""Make portfolio permissions for the request user available in global context"""
if not request.user.is_authenticated:
try:
if not request.user or not request.user.is_authenticated:
return {
"has_base_portfolio_permission": False,
"has_domains_portfolio_permission": False,
"has_domain_requests_portfolio_permission": False,
}
return {
"has_base_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO
),
"has_domains_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_DOMAINS
),
"has_domain_requests_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_REQUESTS
),
}
except AttributeError:
# Handles cases where request.user might not exist
return {
"has_base_portfolio_permission": False,
"has_domains_portfolio_permission": False,
"has_domain_requests_portfolio_permission": False,
}
return {
"has_base_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_PORTFOLIO
),
"has_domains_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_DOMAINS
),
"has_domain_requests_portfolio_permission": request.user.has_portfolio_permission(
User.UserPortfolioPermissionChoices.VIEW_REQUESTS
),
}

View file

@ -3614,7 +3614,7 @@ class TestMyUserAdmin(MockDb):
},
),
("User profile", {"fields": ("first_name", "middle_name", "last_name", "title", "email", "phone")}),
("Permissions", {"fields": ("is_active", "groups")}),
("Permissions", {"fields": ("is_active", "groups", "portfolio", "portfolio_roles", "portfolio_additional_permissions")}),
("Important dates", {"fields": ("last_login", "date_joined")}),
)
self.assertEqual(fieldsets, expected_fieldsets)