zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-25 20:18:38 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'cb/3212-subissues' of github.com:cisagov/manage.get.gov into cb/3212-subissues

Browse source
This commit is contained in:
matthewswspence 2025-03-27 15:00:37 -05:00
commit c0dcac1aee
No known key found for this signature in database
GPG key ID: FB458202A7852BA4
7 changed files with 40 additions and 28 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/registrar/migrations/0144_domainrequest_eop_stakeholder_email_and_more.py
View file

@ -13,17 +13,17 @@ class Migration(migrations.Migration):
migrations.AddField(
model_name="domainrequest",
name="eop_stakeholder_email",
field=models.EmailField(blank=True, max_length=254, null=True, verbose_name="EOP Stakeholder Email"),
field=models.EmailField(blank=True, max_length=254, null=True, verbose_name="EOP contact email"),
),
migrations.AddField(
model_name="domainrequest",
name="eop_stakeholder_first_name",
field=models.CharField(blank=True, null=True, verbose_name="EOP Stakeholder First Name"),
field=models.CharField(blank=True, null=True, verbose_name="EOP contact first name"),
),
migrations.AddField(
model_name="domainrequest",
name="eop_stakeholder_last_name",
field=models.CharField(blank=True, null=True, verbose_name="EOP Stakeholder Last Name"),
field=models.CharField(blank=True, null=True, verbose_name="EOP contact last name"),
),
migrations.AddField(
model_name="domainrequest",

2
src/registrar/migrations/0145_remove_domainrequest_eop_stakeholder_email_and_more.py
View file

@ -17,7 +17,7 @@ class Migration(migrations.Migration):
migrations.AlterField(
model_name="domainrequest",
name="feb_naming_requirements",
field=models.BooleanField(blank=True, null=True, verbose_name="Meets Naming Requirements"),
field=models.BooleanField(blank=True, null=True, verbose_name="Meets naming requirements"),
),
migrations.AlterField(
model_name="domainrequest",

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

@ -515,7 +515,7 @@ class DomainRequest(TimeStampedModel):
feb_naming_requirements = models.BooleanField(
null=True,
blank=True,
verbose_name="Meets Naming Requirements",
verbose_name="Meets naming requirements",
)
feb_naming_requirements_details = models.TextField(
@ -540,13 +540,13 @@ class DomainRequest(TimeStampedModel):
eop_stakeholder_first_name = models.CharField(
null=True,
blank=True,
verbose_name="EOP Stakeholder First Name",
verbose_name="EOP contact first name",
)
eop_stakeholder_last_name = models.CharField(
null=True,
blank=True,
verbose_name="EOP Stakeholder Last Name",
verbose_name="EOP contact last name",
)
# This field is alternately used for generic domain purpose explanations

4
src/registrar/templates/emails/includes/portfolio_domain_request_summary.txt
View file

@ -9,7 +9,7 @@ Current websites: {% for site in domain_request.current_websites.all %}
.gov domain:
{{ domain_request.requested_domain.name }}
{% if requires_feb_questions %}
Meets Naming Requirements
Meets naming requirements
{% if domain_request.feb_naming_requirements %}
{{ domain_request.feb_naming_requirements }}
{% else %}
@ -41,7 +41,7 @@ No
{{ domain_request.purpose }}
{% endif %}
{% if requires_feb_questions %}
EOP Stakeholder:
EOP contact:
{% if domain_request.working_with_eop %}
{{ domain_request.eop_contact.first_name }} {{ domain_request.eop_contact.last_name }}
{{ domain_request.eop_contact.email }}

24
src/registrar/templates/includes/portfolio_request_review_steps.html
View file

@ -54,7 +54,7 @@
</ul>
{% endif %}
{% if requires_feb_questions %}
<h4 class="margin-bottom-0">Meets Naming Requirements</h4>
<h4 class="margin-bottom-0">Meets naming requirements</h4>
{% if domain_request.feb_naming_requirements is None %}
<p class="margin-y-0"><span class='text-bold text-secondary-dark'>Incomplete</span></p>
{% elif domain_request.feb_naming_requirements %}
@ -78,7 +78,7 @@
{% else %}
<p class="margin-y-0"><span class='text-bold text-secondary-dark'>Incomplete</span></p>
{% endif %}
<h4 class="margin-bottom-0">Target Time Frame</h4>
<h4 class="margin-bottom-0">Target time frame</h4>
{% if domain_request.has_timeframe is None %}
<p class="margin-y-0"><span class='text-bold text-secondary-dark'>Incomplete</span></p>
{% elif domain_request.has_timeframe %}
@ -86,7 +86,7 @@
{% else %}
<p class="margin-y-0">No</p>
{% endif %}
<h4 class="margin-bottom-0">Interagency Initiative</h4>
<h4 class="margin-bottom-0">Interagency initiative</h4>
{% if domain_request.is_interagency_initiative is None %}
<p class="margin-y-0"><span class='text-bold text-secondary-dark'>Incomplete</span></p>
{% elif domain_request.is_interagency_initiative %}
@ -102,11 +102,11 @@
{% endif %}
{% if step == Step.ADDITIONAL_DETAILS %}
{% 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 %}
{% if requires_feb_questions %}
<h4 class="margin-bottom-0">EOP Stakeholder</h4>
{% with title=form_titles|get_item:step %}
{% include "includes/summary_item.html" with title=title value=" " heading_level=heading_level editable=is_editable edit_link=domain_request_url %}
{% endwith %}
<h4 class="margin-bottom-0">EOP contact</h4>
{% if domain_request.working_with_eop is None %}
<p class="margin-y-0"><span class='text-bold text-secondary-dark'>Incomplete</span></p>
{% elif domain_request.working_with_eop %}
@ -114,6 +114,16 @@
{% else %}
<p class="margin-y-0">No</p>
{% endif %}
<h4 class="margin-bottom-0">Anything else</h4>
{% if domain_request.anything_else %}
<p class="margin-y-0">{{domain_request.anything_else}}</p>
{% else %}
<p class="margin-y-0">None</p>
{% endif %}
{% else %}
{% 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 %}
{% endif %}

10
src/registrar/templates/portfolio_domain_request_additional_details.html
View file

@ -6,6 +6,7 @@
{% endblock %}
{% block form_fields %}
{% include "includes/required_fields.html" %}
{% if requires_feb_questions %}
<fieldset class="usa-fieldset">
{{forms.0.management_form}}
@ -13,6 +14,7 @@
{{forms.2.management_form}}
{{forms.3.management_form}}
<h2 class="margin-top-0 margin-bottom-0">Are you working with someone in the Executive Office of the President (EOP) on this request?</h2>
<p class="margin-bottom-2 margin-top-2">Working with the EOP is not required to request a .gov domain.</p>
<p class="margin-bottom-0 margin-top-1">
<em>Select one. <abbr class="usa-hint usa-hint--required" title="required">*</abbr></em>
</p>
@ -21,8 +23,8 @@
{% endwith %}
<div id="eop-contact-container" class="conditional-panel display-none">
<p class="margin-bottom-0 margin-top-1">
Provide the name and email of the person you're working with.<span class="usa-label--required">*</span>
<p class="margin-bottom-3 margin-top-3">
<em>Provide the name of the person you're working with. <span class="usa-label--required">*</span></em>
</p>
{% with add_class="usa-radio__input--tile" add_legend_class="usa-sr-only" %}
{% input_with_errors forms.1.first_name %}
@ -39,8 +41,8 @@
{% endwith %}
<div id="anything-else-details-container" class="conditional-panel display-none">
<p class="usa-label">
<em>Provide details below <span class="usa-label--required">*</span></em>
<p class="margin-bottom-3 margin-top-3">
<em>Provide details below. <span class="usa-label--required">*</span></em>
</p>
{% with add_label_class="usa-sr-only" attr_required="required" attr_maxlength="2000" %}
{% input_with_errors forms.3.anything_else %}

16
src/registrar/tests/test_views_request.py
View file

@ -2742,22 +2742,22 @@ class DomainRequestTests(TestWithUser, WebTest):
)
def feb_review_page_tests(self, review_page):
# Meets Naming Requirements
self.assertContains(review_page, "Meets Naming Requirements")
# Meets naming requirements
self.assertContains(review_page, "Meets naming requirements")
self.assertContains(review_page, "No")
self.assertContains(review_page, "Because this is a test")
# Purpose
self.assertContains(review_page, "Purpose")
self.assertContains(review_page, "Used as a redirect for an existing website")
self.assertContains(review_page, "testPurpose123")
# Target Time Frame
self.assertContains(review_page, "Target Time Frame")
# Target time frame
self.assertContains(review_page, "Target time frame")
self.assertContains(review_page, "1/2/2025 - 1/2/2026")
# Interagency Initiative
self.assertContains(review_page, "Interagency Initiative")
# Interagency initiative
self.assertContains(review_page, "Interagency initiative")
self.assertContains(review_page, "FakeInteragencyInitiative")
# EOP Stakeholder
self.assertContains(review_page, "EOP Stakeholder")
# EOP contact
self.assertContains(review_page, "EOP contact")
self.assertContains(review_page, "TesterFirstName TesterLastName")
@less_console_noise_decorator