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

Replace inline if with .get

Browse source 
Not sure why I was doing that
This commit is contained in:
zandercymatics 2024-08-21 08:46:47 -06:00
parent 4f4dac2728
commit 729ce4c9f7
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
5 changed files with 13 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/context_processors.py
View file

@ -61,7 +61,7 @@ def add_has_profile_feature_flag_to_context(request):
def portfolio_permissions(request): def portfolio_permissions(request):
"""Make portfolio permissions for the request user available in global context""" """Make portfolio permissions for the request user available in global context"""
try: try:
portfolio = request.session["portfolio"] if "portfolio" in request.session else None portfolio = request.session.get("portfolio")
if portfolio: if portfolio:
return { return {
"has_base_portfolio_permission": request.user.has_base_portfolio_permission(portfolio), "has_base_portfolio_permission": request.user.has_base_portfolio_permission(portfolio),

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

@ -385,12 +385,12 @@ class User(AbstractUser):
def is_org_user(self, request): def is_org_user(self, request):
has_organization_feature_flag = flag_is_active(request, "organization_feature") has_organization_feature_flag = flag_is_active(request, "organization_feature")
portfolio = request.session["portfolio"] if "portfolio" in request.session else None portfolio = request.session.get("portfolio")
return has_organization_feature_flag and self.has_base_portfolio_permission(portfolio) return has_organization_feature_flag and self.has_base_portfolio_permission(portfolio)
def get_user_domain_ids(self, request): def get_user_domain_ids(self, request):
"""Returns either the domains ids associated with this user on UserDomainRole or Portfolio""" """Returns either the domains ids associated with this user on UserDomainRole or Portfolio"""
portfolio = request.session["portfolio"] if "portfolio" in request.session else None portfolio = request.session.get("portfolio")
if self.is_org_user(request) and self.has_view_all_domains_permission(portfolio): if self.is_org_user(request) and self.has_view_all_domains_permission(portfolio):
return DomainInformation.objects.filter(portfolio=portfolio).values_list( return DomainInformation.objects.filter(portfolio=portfolio).values_list(
"domain_id", flat=True "domain_id", flat=True

8
src/registrar/views/domain.py
View file

@ -174,7 +174,7 @@ class DomainView(DomainBaseView):
"""Most views should not allow permission to portfolio users. """Most views should not allow permission to portfolio users.
If particular views allow permissions, they will need to override If particular views allow permissions, they will need to override
this function.""" this function."""
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if self.request.user.has_domains_portfolio_permission(portfolio): if self.request.user.has_domains_portfolio_permission(portfolio):
if Domain.objects.filter(id=pk).exists(): if Domain.objects.filter(id=pk).exists():
domain = Domain.objects.get(id=pk) domain = Domain.objects.get(id=pk)
@ -237,7 +237,7 @@ class DomainOrgNameAddressView(DomainFormBaseView):
# Org users shouldn't have access to this page # Org users shouldn't have access to this page
is_org_user = self.request.user.is_org_user(self.request) is_org_user = self.request.user.is_org_user(self.request)
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if portfolio and is_org_user: if portfolio and is_org_user:
return False return False
else: else:
@ -257,7 +257,7 @@ class DomainSubOrganizationView(DomainFormBaseView):
# non-org users shouldn't have access to this page # non-org users shouldn't have access to this page
is_org_user = self.request.user.is_org_user(self.request) is_org_user = self.request.user.is_org_user(self.request)
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if portfolio and is_org_user: if portfolio and is_org_user:
return super().has_permission() return super().has_permission()
else: else:
@ -338,7 +338,7 @@ class DomainSeniorOfficialView(DomainFormBaseView):
# Org users shouldn't have access to this page # Org users shouldn't have access to this page
is_org_user = self.request.user.is_org_user(self.request) is_org_user = self.request.user.is_org_user(self.request)
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if portfolio and is_org_user: if portfolio and is_org_user:
return False return False
else: else:

6
src/registrar/views/portfolios.py
View file

@ -51,7 +51,7 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
def get_context_data(self, **kwargs): def get_context_data(self, **kwargs):
"""Add additional context data to the template.""" """Add additional context data to the template."""
context = super().get_context_data(**kwargs) context = super().get_context_data(**kwargs)
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission( context["has_edit_org_portfolio_permission"] = self.request.user.has_edit_org_portfolio_permission(
portfolio portfolio
) )
@ -59,7 +59,7 @@ class PortfolioOrganizationView(PortfolioBasePermissionView, FormMixin):
def get_object(self, queryset=None): def get_object(self, queryset=None):
"""Get the portfolio object based on the session.""" """Get the portfolio object based on the session."""
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if portfolio is None: if portfolio is None:
raise Http404("No organization found for this user") raise Http404("No organization found for this user")
return portfolio return portfolio
@ -115,7 +115,7 @@ class PortfolioSeniorOfficialView(PortfolioBasePermissionView, FormMixin):
def get_object(self, queryset=None): def get_object(self, queryset=None):
"""Get the portfolio object based on the session.""" """Get the portfolio object based on the session."""
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
if portfolio is None: if portfolio is None:
raise Http404("No organization found for this user") raise Http404("No organization found for this user")
return portfolio return portfolio

6
src/registrar/views/utility/mixins.py
View file

@ -419,7 +419,7 @@ class PortfolioBasePermission(PermissionsLoginMixin):
if not self.request.user.is_authenticated: if not self.request.user.is_authenticated:
return False return False
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
return self.request.user.has_base_portfolio_permission(portfolio) return self.request.user.has_base_portfolio_permission(portfolio)
@ -436,7 +436,7 @@ class PortfolioDomainsPermission(PortfolioBasePermission):
if not self.request.user.is_authenticated: if not self.request.user.is_authenticated:
return False return False
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
return self.request.user.has_domains_portfolio_permission(portfolio) return self.request.user.has_domains_portfolio_permission(portfolio)
@ -453,5 +453,5 @@ class PortfolioDomainRequestsPermission(PortfolioBasePermission):
if not self.request.user.is_authenticated: if not self.request.user.is_authenticated:
return False return False
portfolio = self.request.session["portfolio"] if "portfolio" in self.request.session else None portfolio = self.request.session.get("portfolio")
return self.request.user.has_domain_requests_portfolio_permission(portfolio) return self.request.user.has_domain_requests_portfolio_permission(portfolio)