zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-21 10:16:13 +02:00
Code Issues Projects Releases Packages Wiki Activity

Allow making subsequent requests in org model

Browse source
This commit is contained in:
Erin Song 2025-04-10 00:07:51 -07:00
parent 60ed2fd0a5
commit 53ea0c2cc6
No known key found for this signature in database
1 changed files with 3 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/registrar/views/domain_request.py
View file

@ -326,7 +326,7 @@ class DomainRequestWizard(TemplateView):
# if pending requests exist and user does not have approved domains, # if pending requests exist and user does not have approved domains,
# present message that domain request cannot be submitted # present message that domain request cannot be submitted
pending_requests = self.pending_requests() pending_requests = self.pending_requests()
if len(pending_requests) > 0: if len(pending_requests) > 0 and not flag_is_active_for_user(self.request.user, "organization_feature"):
message_header = "You cannot submit this request yet" message_header = "You cannot submit this request yet"
message_content = ( message_content = (
f"<h4 class='usa-alert__heading'>{message_header}</h4> " f"<h4 class='usa-alert__heading'>{message_header}</h4> "
@ -625,11 +625,6 @@ class PortfolioAdditionalDetails(DomainRequestWizard):
2: FEBAnythingElseYesNoForm 2: FEBAnythingElseYesNoForm
3: PortfolioAnythingElseForm 3: PortfolioAnythingElseForm
""" """
if not self.requires_feb_questions():
for i in range(3):
forms[i].mark_form_for_deletion()
# If FEB questions aren't required, validate only the anything else form
return forms[3].is_valid()
eop_forms_valid = True eop_forms_valid = True
if not forms[0].is_valid(): if not forms[0].is_valid():
# If the user isn't working with EOP, don't validate the EOP contact form # If the user isn't working with EOP, don't validate the EOP contact form
@ -797,11 +792,11 @@ class Purpose(DomainRequestWizard):
option = feb_purpose_options_form.cleaned_data.get("feb_purpose_choice") option = feb_purpose_options_form.cleaned_data.get("feb_purpose_choice")
if option == "new": if option == "new":
purpose_details_form.fields["purpose"].error_messages = { purpose_details_form.fields["purpose"].error_messages = {
"required": "Provide details on why a new domain is required." "required": "Explain why a new domain is required."
} }
elif option == "redirect": elif option == "redirect":
purpose_details_form.fields["purpose"].error_messages = { purpose_details_form.fields["purpose"].error_messages = {
"required": "Provide details on why a redirect is necessary." "required": "Explain why a redirect is needed."
} }
elif option == "other": elif option == "other":
purpose_details_form.fields["purpose"].error_messages = { purpose_details_form.fields["purpose"].error_messages = {
@ -970,9 +965,6 @@ class Review(DomainRequestWizard):
context["Step"] = self.get_step_enum().__members__ context["Step"] = self.get_step_enum().__members__
context["domain_request"] = self.domain_request context["domain_request"] = self.domain_request
context["requires_feb_questions"] = self.requires_feb_questions() context["requires_feb_questions"] = self.requires_feb_questions()
context["purpose_label"] = DomainRequest.FEBPurposeChoices.get_purpose_label(
self.domain_request.feb_purpose_choice
)
return context return context
def goto_next_step(self): def goto_next_step(self):
@ -1186,10 +1178,6 @@ class PortfolioDomainRequestStatusViewOnly(DetailView):
context["Step"] = PortfolioDomainRequestStep.__members__ context["Step"] = PortfolioDomainRequestStep.__members__
context["steps"] = request_step_list(wizard, PortfolioDomainRequestStep) context["steps"] = request_step_list(wizard, PortfolioDomainRequestStep)
context["form_titles"] = wizard.titles context["form_titles"] = wizard.titles
context["requires_feb_questions"] = self.object.is_feb() and flag_is_active_for_user(
self.request.user, "organization_feature"
)
context["purpose_label"] = DomainRequest.FEBPurposeChoices.get_purpose_label(self.object.feb_purpose_choice)
return context return context