mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-05-20 03:19:24 +02:00
fixed unit tests, updated context processor
This commit is contained in:
parent
1b25be8d96
commit
51509e8b13
2 changed files with 21 additions and 13 deletions
|
@ -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
|
||||
),
|
||||
}
|
||||
|
|
|
@ -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)
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue