From 1ea3dc0d1529b5075ca06e1368e3db7de2ea54e7 Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Wed, 16 Apr 2025 15:36:15 -0400 Subject: [PATCH] Check that active user is org member when adding subsequent request --- src/registrar/views/domain_request.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index be4d3b7ba..e17495bcb 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -23,6 +23,7 @@ from registrar.models.user import User from registrar.utility.waffle import flag_is_active_for_user from registrar.views.utility import StepsHelper from registrar.utility.enums import Step, PortfolioDomainRequestStep +from registrar.views.utility.invitation_helper import get_org_membership logger = logging.getLogger(__name__) @@ -326,7 +327,9 @@ class DomainRequestWizard(TemplateView): # if pending requests exist and user does not have approved domains, # present message that domain request cannot be submitted pending_requests = self.pending_requests() - if not flag_is_active_for_user(self.request.user, "organization_feature") and len(pending_requests) > 0: + portfolio = self.request.session.get("portfolio") + _, member_of_this_org = get_org_membership(portfolio, self.request.user.email, self.request.user) + if not member_of_this_org and len(pending_requests) > 0: message_header = "You cannot submit this request yet" message_content = ( f"

{message_header}

"