zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-08-17 15:04:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

pushing to another device

Browse source
This commit is contained in:
Matt-Spence 2025-02-27 13:03:50 -05:00
parent df303fa66f
commit fb06683982
No known key found for this signature in database
3 changed files with 67 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

127
src/registrar/templates/domain_request_purpose.html
View file

@ -5,88 +5,85 @@
<p>.Gov domains are intended for public use. Domains will not be given to organizations that only want to reserve a domain name (defensive registration) or that only intend to use the domain internally (as for an intranet).</p> <p>.Gov domains are intended for public use. Domains will not be given to organizations that only want to reserve a domain name (defensive registration) or that only intend to use the domain internally (as for an intranet).</p>
<p>Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/requirements/' %}">activities that are prohibited on .gov domains.</a></p> <p>Read about <a class="usa-link" rel="noopener noreferrer" target="_blank" href="{% public_site_url 'domains/requirements/' %}">activities that are prohibited on .gov domains.</a></p>
<h2>What is the purpose of your requested domain?</h2> <h2>What is the purpose of your requested domain?</h2>
<h2>{{requires_feb_questions}}</h2>
{% endblock %} {% endblock %}
{% if requires_feb_questions %} {% block form_required_fields_help_text %}
{% block feb_fields %} {# commented out so it does not appear on this page #}
<fieldset class="usa-fieldset margin-top-0 dotgov-domain-form"> {% endblock %}
{{forms.0.management_form}}
{{forms.1.management_form}}
{{forms.2.management_form}}
{{forms.3.management_form}}
{{forms.4.management_form}}
{{forms.5.management_form}}
<p class="usa-label">
Select One <span class="usa-label--required">*</span>
</p>
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %}
{% input_with_errors forms.0.feb_purpose_choice %}
{% endwith %}
<div id="domain-purpose-details-container" class="conditional-panel" style="display: none;"> {% block form_fields %}
{% if requires_feb_questions %}
<fieldset class="usa-fieldset margin-top-0 dotgov-domain-form">
{{forms.0.management_form}}
{{forms.1.management_form}}
{{forms.2.management_form}}
{{forms.3.management_form}}
{{forms.4.management_form}}
{{forms.5.management_form}}
<p class="usa-label"> <p class="usa-label">
Provide details below <span class="usa-label--required">*</span> Select One <span class="usa-label--required">*</span>
</p> </p>
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %} {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
{% input_with_errors forms.1.purpose %} {% input_with_errors forms.0.feb_purpose_choice %}
{% endwith %} {% endwith %}
<p class="usa-hint">Maximum 2000 characters allowed.</p>
</div>
<legend> <div id="domain-purpose-details-container" class="conditional-panel" style="display: none;">
<h3>Do you have a target time frame for launching this domain?</h3> <p class="usa-label">
</legend> Provide details below <span class="usa-label--required">*</span>
<p class="usa-label"> </p>
Select One <span class="usa-label--required">*</span> {% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %}
</p> {% input_with_errors forms.1.purpose %}
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %} {% endwith %}
{% input_with_errors forms.2.has_timeframe %} <p class="usa-hint">Maximum 2000 characters allowed.</p>
{% endwith %} </div>
<div id="domain-timeframe-details-container" class="conditional-panel" style="display: none;"> <legend>
<h3>Do you have a target time frame for launching this domain?</h3>
</legend>
<p class="usa-label"> <p class="usa-label">
Provide details below <span class="usa-label--required">*</span> Select One <span class="usa-label--required">*</span>
</p> </p>
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %} {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
{% input_with_errors forms.3.time_frame_details %} {% input_with_errors forms.2.has_timeframe %}
{% endwith %} {% endwith %}
<p class="usa-hint">Maximum 2000 characters allowed.</p>
</div>
<legend> <div id="domain-timeframe-details-container" class="conditional-panel" style="display: none;">
<h3>Will the domain name be used for an interagency initiative?</h3> <p class="usa-label">
</legend> Provide details below <span class="usa-label--required">*</span>
<p class="usa-label"> </p>
Select One <span class="usa-label--required">*</span> {% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %}
</p> {% input_with_errors forms.3.time_frame_details %}
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %} {% endwith %}
{% input_with_errors forms.4.is_interagency_initiative %} <p class="usa-hint">Maximum 2000 characters allowed.</p>
{% endwith %} </div>
<div id="domain-interagency-initaitive-details-container" class="conditional-panel" style="display: none;"> <legend>
<h3>Will the domain name be used for an interagency initiative?</h3>
</legend>
<p class="usa-label"> <p class="usa-label">
Provide details below <span class="usa-label--required">*</span> Select One <span class="usa-label--required">*</span>
</p> </p>
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %} {% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
{% input_with_errors forms.5.interagency_initiative_details %} {% input_with_errors forms.4.is_interagency_initiative %}
{% endwith %} {% endwith %}
<p class="usa-hint">Maximum 2000 characters allowed.</p>
</div>
</fieldset>
{% endblock %}
{% else %}
<p>Describe how you’ll use your .gov domain. Will it be used for a website, email, or something else?</p>
{% block form_required_fields_help_text %} <div id="domain-interagency-initaitive-details-container" class="conditional-panel" style="display: none;">
{# commented out so it does not appear on this page #} <p class="usa-label">
{% endblock %} Provide details below <span class="usa-label--required">*</span>
</p>
{% with add_label_class="usa-sr-only" attr_required="required" maxlength="2000" %}
{% input_with_errors forms.5.interagency_initiative_details %}
{% endwith %}
<p class="usa-hint">Maximum 2000 characters allowed.</p>
</div>
</fieldset>
{% else %}
<p>Describe how you’ll use your .gov domain. Will it be used for a website, email, or something else?</p>
{% block form_fields %} {% with attr_maxlength=2000 add_label_class="usa-sr-only" %}
{% with attr_maxlength=2000 add_label_class="usa-sr-only" %} {% input_with_errors forms.1.purpose %}
{% input_with_errors forms.1.purpose %} {% endwith %}
{% endwith %} {% endif %}
{% endblock %} {% endblock %}
{% endif %}

4
src/registrar/tests/test_forms.py
View file

@ -14,7 +14,7 @@ from registrar.forms.domain_request_wizard import (
OtherContactsForm, OtherContactsForm,
RequirementsForm, RequirementsForm,
TribalGovernmentForm, TribalGovernmentForm,
PurposeForm, PurposeDetailsForm,
AnythingElseForm, AnythingElseForm,
AboutYourOrganizationForm, AboutYourOrganizationForm,
) )
@ -257,7 +257,7 @@ class TestFormValidation(MockEppLib):
@less_console_noise_decorator @less_console_noise_decorator
def test_purpose_form_character_count_invalid(self): def test_purpose_form_character_count_invalid(self):
"""Response must be less than 2000 characters.""" """Response must be less than 2000 characters."""
form = PurposeForm( form = PurposeDetailsForm(
data={ data={
"purpose": "Bacon ipsum dolor amet fatback strip steak pastrami" "purpose": "Bacon ipsum dolor amet fatback strip steak pastrami"
"shankle, drumstick doner chicken landjaeger turkey andouille." "shankle, drumstick doner chicken landjaeger turkey andouille."

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

@ -184,7 +184,7 @@ class DomainRequestWizard(DomainRequestWizardPermissionView, TemplateView):
def requires_feb_questions(self) -> bool: def requires_feb_questions(self) -> bool:
# TODO: this is for testing, revert later # TODO: this is for testing, revert later
return False return True
# return self.domain_request.is_feb() and flag_is_active_for_user(self.request.user, "organization_feature") # return self.domain_request.is_feb() and flag_is_active_for_user(self.request.user, "organization_feature")
@property @property
@ -754,7 +754,7 @@ class Purpose(DomainRequestWizard):
# we only care about the purpose form in this case since it's used in both instances # we only care about the purpose form in this case since it's used in both instances
return purpose_details_form.is_valid() return purpose_details_form.is_valid()
if not feb_purpose_options_form.id_valid(): if not feb_purpose_options_form.is_valid():
# Ensure details form doesn't throw errors if it's not showing # Ensure details form doesn't throw errors if it's not showing
purpose_details_form.mark_form_for_deletion() purpose_details_form.mark_form_for_deletion()
@ -764,7 +764,7 @@ class Purpose(DomainRequestWizard):
if not feb_timeframe_yes_no_form.is_valid() or not feb_initiative_yes_no_form.cleaned_data.get("is_interagency_initiative"): if not feb_timeframe_yes_no_form.is_valid() or not feb_initiative_yes_no_form.cleaned_data.get("is_interagency_initiative"):
# Ensure details form doesn't throw errors if it's not showing # Ensure details form doesn't throw errors if it's not showing
feb_timeframe_details_form.mark_form_for_delation() feb_timeframe_details_form.mark_form_for_deletion()
valid = all(form.is_valid() for form in forms_list if not form.form_data_marked_for_deletion) valid = all(form.is_valid() for form in forms_list if not form.form_data_marked_for_deletion)