mirror of
https://github.com/cisagov/manage.get.gov.git
synced 2025-08-03 00:12:16 +02:00
lint pt 2
This commit is contained in:
parent
a362c2ef6c
commit
381ac49487
3 changed files with 4 additions and 6 deletions
|
@ -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
|
||||
|
|
|
@ -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")
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue