diff --git a/src/registrar/models/user.py b/src/registrar/models/user.py index 73b67b6ae..521093e2f 100644 --- a/src/registrar/models/user.py +++ b/src/registrar/models/user.py @@ -3,7 +3,6 @@ import logging from django.contrib.auth.models import AbstractUser from django.db import models from django.db.models import Q -from django.forms import ValidationError from registrar.models import DomainInformation, UserDomainRole from registrar.models.utility.portfolio_helper import UserPortfolioPermissionChoices, UserPortfolioRoleChoices diff --git a/src/registrar/registrar_middleware.py b/src/registrar/registrar_middleware.py index 1da74a527..d0f2dfa2f 100644 --- a/src/registrar/registrar_middleware.py +++ b/src/registrar/registrar_middleware.py @@ -143,20 +143,20 @@ class CheckPortfolioMiddleware: if not request.user.is_authenticated: return None - + # 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 flag_is_active(request, "multiple_portfolios"): # NOTE: we will want to change later to have a workflow for selecting # portfolio and another for switching portfolio; for now, select first 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() else: 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_domains_portfolio_permission(request.session["portfolio"]): portfolio_redirect = reverse("domains") diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index 144605b87..49d2b4802 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -41,7 +41,6 @@ from registrar.models import ( TransitionDomain, Portfolio, Suborganization, - UserPortfolioPermission, ) from registrar.models.portfolio_invitation import PortfolioInvitation from registrar.models.senior_official import SeniorOfficial