zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 03:58:39 +02:00
Code Issues Projects Releases Packages Wiki Activity

lintomatic

Browse source
This commit is contained in:
zandercymatics 2024-12-13 14:12:00 -07:00
parent c551a60e3a
commit b5464a9da8
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 20 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/forms/portfolio.py
View file

@ -150,7 +150,6 @@ class BasePortfolioMemberForm(forms.Form):
)
domain_request_permission_member = forms.ChoiceField(
# nosec B308 - required_star is a hardcoded HTML string
label=mark_safe(f"Select permission {required_star}"), # nosec
choices=[
(UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS.value, "View all requests"),
@ -276,7 +275,9 @@ class BasePortfolioMemberForm(forms.Form):
"role": role,
"member_permission_admin": getattr(member_permission, "value", None) if is_admin else None,
"domain_request_permission_admin": getattr(domain_request_permission, "value", None) if is_admin else None,
"domain_request_permission_member": getattr(domain_request_permission, "value", None) if not is_admin else None,
"domain_request_permission_member": (
getattr(domain_request_permission, "value", None) if not is_admin else None
),
}
# Edgecase: Member uses a special form value for None called "no_access". This ensures a form selection.

28
src/registrar/tests/test_views_portfolio.py
View file

@ -2692,7 +2692,7 @@ class TestEditPortfolioMemberView(WebTest):
user=basic_member,
portfolio=self.portfolio,
roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER],
additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS]
additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS],
)
response = self.client.post(
@ -2701,7 +2701,7 @@ class TestEditPortfolioMemberView(WebTest):
"role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
"domain_request_permission_admin": UserPortfolioPermissionChoices.EDIT_REQUESTS,
"member_permission_admin": UserPortfolioPermissionChoices.EDIT_MEMBERS,
}
},
)
# Verify redirect and success message
@ -2718,7 +2718,7 @@ class TestEditPortfolioMemberView(WebTest):
UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
UserPortfolioPermissionChoices.EDIT_MEMBERS,
UserPortfolioPermissionChoices.VIEW_MEMBERS,
}
},
)
@less_console_noise_decorator
@ -2730,9 +2730,7 @@ class TestEditPortfolioMemberView(WebTest):
member = create_test_user()
permission = UserPortfolioPermission.objects.create(
user=member,
portfolio=self.portfolio,
roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
user=member, portfolio=self.portfolio, roles=[UserPortfolioRoleChoices.ORGANIZATION_MEMBER]
)
# Test missing required admin permissions
@ -2741,17 +2739,16 @@ class TestEditPortfolioMemberView(WebTest):
{
"role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
# Missing required admin fields
}
},
)
self.assertEqual(response.status_code, 200)
self.assertEqual(
response.context["form"].errors["domain_request_permission_admin"][0],
"Admin domain request permission is required"
"Admin domain request permission is required",
)
self.assertEqual(
response.context["form"].errors["member_permission_admin"][0],
"Admin member permission is required"
response.context["form"].errors["member_permission_admin"][0], "Admin member permission is required"
)
@less_console_noise_decorator
@ -2768,7 +2765,7 @@ class TestEditPortfolioMemberView(WebTest):
"role": UserPortfolioRoleChoices.ORGANIZATION_ADMIN,
"domain_request_permission_admin": UserPortfolioPermissionChoices.EDIT_REQUESTS,
"member_permission_admin": UserPortfolioPermissionChoices.EDIT_MEMBERS,
}
},
)
self.assertEqual(response.status_code, 302)
@ -2783,7 +2780,7 @@ class TestEditPortfolioMemberView(WebTest):
UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
UserPortfolioPermissionChoices.EDIT_MEMBERS,
UserPortfolioPermissionChoices.VIEW_MEMBERS,
}
},
)
@less_console_noise_decorator
@ -2794,17 +2791,14 @@ class TestEditPortfolioMemberView(WebTest):
self.client.force_login(self.user)
# Get the user's admin permission
admin_permission = UserPortfolioPermission.objects.get(
user=self.user,
portfolio=self.portfolio
)
admin_permission = UserPortfolioPermission.objects.get(user=self.user, portfolio=self.portfolio)
response = self.client.post(
reverse("member-permissions", kwargs={"pk": admin_permission.id}),
{
"role": UserPortfolioRoleChoices.ORGANIZATION_MEMBER,
"domain_request_permission_member": UserPortfolioPermissionChoices.VIEW_ALL_REQUESTS,
}
},
)
self.assertEqual(response.status_code, 302)