zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-30 09:20:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

Cleanup

Browse source
This commit is contained in:
zandercymatics 2024-08-22 08:33:03 -06:00
parent 76fef5303b
commit bef49a85c1
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
2 changed files with 5 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/registrar/models/user_portfolio_permission.py
View file

@ -100,12 +100,12 @@ class UserPortfolioPermission(TimeStampedModel):
# Check if a user is set without accessing the related object. # Check if a user is set without accessing the related object.
has_user = bool(self.user_id) has_user = bool(self.user_id)
# Have to create a bogus request to set the user and pass to flag_is_active if self.pk is None and has_user:
request = HttpRequest() # Have to create a bogus request to set the user and pass to flag_is_active
request.user = self.user request = HttpRequest()
if not flag_is_active(request, "multiple_portfolios") and self.pk is None and has_user: request.user = self.user
existing_permissions = UserPortfolioPermission.objects.filter(user=self.user) existing_permissions = UserPortfolioPermission.objects.filter(user=self.user)
if existing_permissions.exists(): if not flag_is_active(request, "multiple_portfolios") and existing_permissions.exists():
raise ValidationError( raise ValidationError(
"Only one portfolio permission is allowed per user when multiple portfolios are disabled." "Only one portfolio permission is allowed per user when multiple portfolios are disabled."
) )

16
src/registrar/tests/test_models.py
View file

@ -1483,10 +1483,6 @@ class TestUser(TestCase):
portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California") portfolio, _ = Portfolio.objects.get_or_create(creator=self.user, organization_name="Hotel California")
# TODO - uncomment this when we just pass request to these functions
# request = get_wsgi_request_object(self.client, self.user)
# user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
# user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio) user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio) user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
@ -1499,10 +1495,6 @@ class TestUser(TestCase):
additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS], additional_permissions=[UserPortfolioPermissionChoices.VIEW_ALL_DOMAINS],
) )
# TODO - uncomment this when we just pass request to these functions
# request = get_wsgi_request_object(self.client, self.user)
# user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
# user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio) user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio) user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
@ -1513,10 +1505,6 @@ class TestUser(TestCase):
portfolio_permission.save() portfolio_permission.save()
portfolio_permission.refresh_from_db() portfolio_permission.refresh_from_db()
# TODO - uncomment this when we just pass request to these functions
# request = get_wsgi_request_object(self.client, self.user)
# user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
# user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio) user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio) user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)
@ -1525,10 +1513,6 @@ class TestUser(TestCase):
UserDomainRole.objects.get_or_create(user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER) UserDomainRole.objects.get_or_create(user=self.user, domain=self.domain, role=UserDomainRole.Roles.MANAGER)
# TODO - uncomment this when we just pass request to these functions
# request = get_wsgi_request_object(self.client, self.user)
# user_can_view_all_domains = self.user.has_domains_portfolio_permission(request)
# user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(request)
user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio) user_can_view_all_domains = self.user.has_domains_portfolio_permission(portfolio)
user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio) user_can_view_all_requests = self.user.has_domain_requests_portfolio_permission(portfolio)