From 84f85d944f20d621ccdd9b4f4c0d9c46ba548812 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Fri, 29 Nov 2024 14:14:23 -0700 Subject: [PATCH 1/4] Do the thing --- src/registrar/forms/domain_request_wizard.py | 15 +++++++++++++++ ...rtfolio_domain_request_additional_details.html | 10 +++++----- src/registrar/views/domain_request.py | 2 +- 3 files changed, 21 insertions(+), 6 deletions(-) diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index e55c40858..5a791e921 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -794,6 +794,21 @@ class AnythingElseForm(BaseDeletableRegistrarForm): ) +class PortfolioAnythingElseForm(BaseDeletableRegistrarForm): + """The form for the portfolio additional details page. Tied to the anything_else field.""" + anything_else = forms.CharField( + required=False, + label="Anything else?", + widget=forms.Textarea(), + validators=[ + MaxLengthValidator( + 2000, + message="Response must be less than 2000 characters.", + ) + ], + ) + + class AnythingElseYesNoForm(BaseYesNoForm): """Yes/no toggle for the anything else question on additional details""" diff --git a/src/registrar/templates/portfolio_domain_request_additional_details.html b/src/registrar/templates/portfolio_domain_request_additional_details.html index 3c5b50d6b..5bc529243 100644 --- a/src/registrar/templates/portfolio_domain_request_additional_details.html +++ b/src/registrar/templates/portfolio_domain_request_additional_details.html @@ -2,18 +2,18 @@ {% load static field_helpers %} {% block form_required_fields_help_text %} -{% include "includes/required_fields.html" %} +{% comment %} Empty - this step is not required {% endcomment %} {% endblock %} {% block form_fields %} -
-

Is there anything else you’d like us to know about your domain request?

+
+

Is there anything else you’d like us to know about your domain request?

-
-

Provide details below. *

+
+

This question is optional.

{% with attr_maxlength=2000 add_label_class="usa-sr-only" %} {% input_with_errors forms.0.anything_else %} {% endwith %} diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index da194755f..f52c29e9a 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -614,7 +614,7 @@ class RequestingEntity(DomainRequestWizard): class PortfolioAdditionalDetails(DomainRequestWizard): template_name = "portfolio_domain_request_additional_details.html" - forms = [forms.AnythingElseForm] + forms = [forms.PortfolioAnythingElseForm] # Non-portfolio pages From d5357bc2eeb1c6ce319b1069d16c99d70b148fb4 Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:19:35 -0700 Subject: [PATCH 2/4] Code cleanup --- src/registrar/config/urls.py | 4 ++-- .../templates/includes/portfolio_request_review_steps.html | 2 +- src/registrar/views/domain_request.py | 6 ++++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index 53b83e564..66a8a9b74 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -46,8 +46,8 @@ DOMAIN_REQUEST_NAMESPACE = views.DomainRequestWizard.URL_NAMESPACE # dynamically generate the other domain_request_urls domain_request_urls = [ path("", RedirectView.as_view(pattern_name="domain-request:start"), name="redirect-to-start"), - path("start/", views.DomainRequestWizard.as_view(), name="start"), - path("finished/", views.Finished.as_view(), name="finished"), + path("start/", views.DomainRequestWizard.as_view(), name=views.DomainRequestWizard.NEW_URL_NAME), + path("finished/", views.Finished.as_view(), name=views.DomainRequestWizard.FINISHED_URL_NAME), ] for step, view in [ # add/remove steps here diff --git a/src/registrar/templates/includes/portfolio_request_review_steps.html b/src/registrar/templates/includes/portfolio_request_review_steps.html index 5c6e64269..fcb087090 100644 --- a/src/registrar/templates/includes/portfolio_request_review_steps.html +++ b/src/registrar/templates/includes/portfolio_request_review_steps.html @@ -62,7 +62,7 @@ {% endif %} {% if step == Step.ADDITIONAL_DETAILS %} - {% with title=form_titles|get_item:step value=domain_request.anything_else|default:"Incomplete"|safe %} + {% with title=form_titles|get_item:step value=domain_request.anything_else|default:"None" %} {% include "includes/summary_item.html" with title=title value=value heading_level=heading_level editable=is_editable edit_link=domain_request_url %} {% endwith %} {% endif %} diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index f52c29e9a..1fd835055 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -12,6 +12,7 @@ from registrar.forms.utility.wizard_form_helper import request_step_list from registrar.models import DomainRequest from registrar.models.contact import Contact from registrar.models.user import User +from registrar.models.utility.generic_helper import get_url_name from registrar.views.utility import StepsHelper from registrar.views.utility.permission_views import DomainRequestPermissionDeleteView from registrar.utility.enums import Step, PortfolioDomainRequestStep @@ -53,7 +54,8 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): URL_NAMESPACE = "domain-request" # name for accessing /domain-request//edit EDIT_URL_NAME = "edit-domain-request" - NEW_URL_NAME = "/request/start/" + NEW_URL_NAME = "start" + FINISHED_URL_NAME = "finish" # region: Titles # We need to pass our human-readable step titles as context to the templates. @@ -313,7 +315,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): # send users "to the domain request wizard" without needing to know which view # is first in the list of steps. if self.__class__ == DomainRequestWizard: - if request.path_info == self.NEW_URL_NAME: + if current_url == self.NEW_URL_NAME: # Clear context so the prop getter won't create a request here. # Creating a request will be handled in the post method for the # intro page. From ee0f5e8a0de5211fd58432b67ce37a36906f65fb Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:31:06 -0700 Subject: [PATCH 3/4] Cleanup --- src/registrar/forms/domain_request_wizard.py | 1 + src/registrar/views/domain_request.py | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index 5a791e921..95d6571d6 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -796,6 +796,7 @@ class AnythingElseForm(BaseDeletableRegistrarForm): class PortfolioAnythingElseForm(BaseDeletableRegistrarForm): """The form for the portfolio additional details page. Tied to the anything_else field.""" + anything_else = forms.CharField( required=False, label="Anything else?", diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 1fd835055..33c157388 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -55,7 +55,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView): # name for accessing /domain-request//edit EDIT_URL_NAME = "edit-domain-request" NEW_URL_NAME = "start" - FINISHED_URL_NAME = "finish" + FINISHED_URL_NAME = "finished" # region: Titles # We need to pass our human-readable step titles as context to the templates. From d5a8af228701a0b1ee12e1a75f70775f11da459c Mon Sep 17 00:00:00 2001 From: zandercymatics <141044360+zandercymatics@users.noreply.github.com> Date: Tue, 3 Dec 2024 10:38:00 -0700 Subject: [PATCH 4/4] Update domain_request.py --- src/registrar/views/domain_request.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/registrar/views/domain_request.py b/src/registrar/views/domain_request.py index 33c157388..85f7576d0 100644 --- a/src/registrar/views/domain_request.py +++ b/src/registrar/views/domain_request.py @@ -12,7 +12,6 @@ from registrar.forms.utility.wizard_form_helper import request_step_list from registrar.models import DomainRequest from registrar.models.contact import Contact from registrar.models.user import User -from registrar.models.utility.generic_helper import get_url_name from registrar.views.utility import StepsHelper from registrar.views.utility.permission_views import DomainRequestPermissionDeleteView from registrar.utility.enums import Step, PortfolioDomainRequestStep