zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-17 15:04:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

Refactor fields using portfolio

Browse source
This commit is contained in:
zandercymatics 2024-08-16 15:05:30 -06:00
parent e03e6f7d35
commit 1090d75f75
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
6 changed files with 16 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/registrar/models/user.py
View file

@ -338,7 +338,7 @@ class User(AbstractUser):
for invitation in PortfolioInvitation.objects.filter(
email__iexact=self.email, status=PortfolioInvitation.PortfolioInvitationStatus.INVITED
):
if self.portfolio is None:
if self.last_selected_portfolio is None:
try:
invitation.retrieve()
invitation.save()
@ -410,6 +410,6 @@ class User(AbstractUser):
def get_user_domain_ids(self, request):
"""Returns either the domains ids associated with this user on UserDomainRole or Portfolio"""
if self.is_org_user(request) and self.has_view_all_domains_permission():
return DomainInformation.objects.filter(portfolio=self.portfolio).values_list("domain_id", flat=True)
return DomainInformation.objects.filter(portfolio=self.last_selected_portfolio).values_list("domain_id", flat=True)
else:
return UserDomainRole.objects.filter(user=self).values_list("domain_id", flat=True)