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

lint pt 2

Browse source
This commit is contained in:
zandercymatics 2024-08-20 14:58:51 -06:00
parent a362c2ef6c
commit 381ac49487
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -3,7 +3,6 @@ import logging
from django.contrib.auth.models import AbstractUser from django.contrib.auth.models import AbstractUser
from django.db import models from django.db import models
from django.db.models import Q from django.db.models import Q
from django.forms import ValidationError
from registrar.models import DomainInformation, UserDomainRole from registrar.models import DomainInformation, UserDomainRole
from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices

8
src/registrar/registrar_middleware.py
View file

@ -143,20 +143,20 @@ class CheckPortfolioMiddleware:
if not request.user.is_authenticated: if not request.user.is_authenticated:
return None return None
# set the portfolio in the session if it is not set # set the portfolio in the session if it is not set
if not "portfolio" in request.session or request.session["portfolio"] is None: if "portfolio" not in request.session or request.session["portfolio"] is None:
# if user is a multiple portfolio # if user is a multiple portfolio
if flag_is_active(request, "multiple_portfolios"): if flag_is_active(request, "multiple_portfolios"):
# NOTE: we will want to change later to have a workflow for selecting # NOTE: we will want to change later to have a workflow for selecting
# portfolio and another for switching portfolio; for now, select first # portfolio and another for switching portfolio; for now, select first
request.session["portfolio"] = request.user.get_first_portfolio() request.session["portfolio"] = request.user.get_first_portfolio()
elif flag_is_active(request, "organization_feature"): elif flag_is_active(request, "organization_feature"):
request.session["portfolio"] = request.user.get_first_portfolio() request.session["portfolio"] = request.user.get_first_portfolio()
else: else:
request.session["portfolio"] = None request.session["portfolio"] = None
if request.session["portfolio"] is not None and current_path == self.home: if request.session["portfolio"] is not None and current_path == self.home:
if request.user.has_base_portfolio_permission(request.session["portfolio"]): if request.user.has_base_portfolio_permission(request.session["portfolio"]):
if request.user.has_domains_portfolio_permission(request.session["portfolio"]): if request.user.has_domains_portfolio_permission(request.session["portfolio"]):
portfolio_redirect = reverse("domains") portfolio_redirect = reverse("domains")

1
src/registrar/tests/test_admin.py
View file

@ -41,7 +41,6 @@ from registrar.models import (
TransitionDomain, TransitionDomain,
Portfolio, Portfolio,
Suborganization, Suborganization,
UserPortfolioPermission,
) )
from registrar.models.portfolio_invitation import PortfolioInvitation from registrar.models.portfolio_invitation import PortfolioInvitation
from registrar.models.senior_official import SeniorOfficial from registrar.models.senior_official import SeniorOfficial