This commit is contained in:
zandercymatics 2024-09-06 12:11:49 -06:00
parent 1e9ae7befc
commit 7a67845b6d
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 10 additions and 0 deletions

View file

@ -162,6 +162,10 @@ class CheckPortfolioMiddleware:
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
else:
# Edge case: waffle flag is changed while the user is logged in
if not request.user.is_org_user(request) and request.session.get("portfolio"):
request.session["portfolio"] = None
if request.session.get("portfolio"): if request.session.get("portfolio"):
if current_path == self.home: if current_path == self.home:

View file

@ -2,6 +2,7 @@ from django.urls import reverse
from api.tests.common import less_console_noise_decorator from api.tests.common import less_console_noise_decorator
from registrar.config import settings from registrar.config import settings
from registrar.models import Portfolio, SeniorOfficial from registrar.models import Portfolio, SeniorOfficial
from unittest import skip
from django_webtest import WebTest # type: ignore from django_webtest import WebTest # type: ignore
from registrar.models import ( from registrar.models import (
DomainRequest, DomainRequest,
@ -532,3 +533,7 @@ class TestPortfolio(WebTest):
self.assertEqual(response.status_code, 200) self.assertEqual(response.status_code, 200)
self.assertContains(response, "Domain name") self.assertContains(response, "Domain name")
permission.delete() permission.delete()
@skip("TODO")
def test_portfolio_cache_updates_when_modified(self):
pass

View file

@ -522,6 +522,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
return HttpResponseRedirect(reverse("domain-requests")) return HttpResponseRedirect(reverse("domain-requests"))
else: else:
return HttpResponseRedirect(reverse("home")) return HttpResponseRedirect(reverse("home"))
# otherwise, proceed as normal # otherwise, proceed as normal
return self.goto_next_step() return self.goto_next_step()