From ffedcac4392e470af46404170163135eaf98bd05 Mon Sep 17 00:00:00 2001 From: Seamus Johnston Date: Mon, 6 Feb 2023 08:27:58 -0600 Subject: [PATCH 1/2] Update key personnel language --- src/registrar/forms/application_wizard.py | 12 ++++++++++ ...application_no_other_contacts_rationale.py | 22 +++++++++++++++++++ src/registrar/models/domain_application.py | 6 +++++ .../templates/application_other_contacts.html | 10 ++++++++- src/registrar/views/application.py | 4 ++-- 5 files changed, 51 insertions(+), 3 deletions(-) create mode 100644 src/registrar/migrations/0010_domainapplication_no_other_contacts_rationale.py diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 0b7f00e69..0b4ec5db3 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -660,6 +660,18 @@ OtherContactsFormSet = forms.formset_factory( ) +class NoOtherContactsForm(RegistrarForm): + no_other_contacts_rationale = forms.CharField( + required=False, + # label has to end in a space to get the label_suffix to show + label=( + "If you can’t provide other contacts for your organization," + " please explain why." + ), + widget=forms.Textarea(), + ) + + class SecurityEmailForm(RegistrarForm): security_email = forms.EmailField( required=False, diff --git a/src/registrar/migrations/0010_domainapplication_no_other_contacts_rationale.py b/src/registrar/migrations/0010_domainapplication_no_other_contacts_rationale.py new file mode 100644 index 000000000..825d17aba --- /dev/null +++ b/src/registrar/migrations/0010_domainapplication_no_other_contacts_rationale.py @@ -0,0 +1,22 @@ +# Generated by Django 4.1.5 on 2023-02-06 14:17 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ("registrar", "0009_domainapplication_federally_recognized_tribe_and_more"), + ] + + operations = [ + migrations.AddField( + model_name="domainapplication", + name="no_other_contacts_rationale", + field=models.TextField( + blank=True, + help_text="Reason for listing no additional contacts", + null=True, + ), + ), + ] diff --git a/src/registrar/models/domain_application.py b/src/registrar/models/domain_application.py index 7924b2d2f..faebb7eb6 100644 --- a/src/registrar/models/domain_application.py +++ b/src/registrar/models/domain_application.py @@ -428,6 +428,12 @@ class DomainApplication(TimeStampedModel): related_name="contact_applications", ) + no_other_contacts_rationale = models.TextField( + null=True, + blank=True, + help_text="Reason for listing no additional contacts", + ) + security_email = models.CharField( max_length=320, null=True, diff --git a/src/registrar/templates/application_other_contacts.html b/src/registrar/templates/application_other_contacts.html index 3a8422d7b..582ecc3c3 100644 --- a/src/registrar/templates/application_other_contacts.html +++ b/src/registrar/templates/application_other_contacts.html @@ -7,6 +7,10 @@ managing your organization or its technical infrastructure. This information will help us assess your eligibility and understand the purpose of the .gov domain. These contacts should be in addition to you and your authorizing official.

+ +

Please list other administrative or technical contacts. They should be employees of + your organization. We’ll email these contacts to let them know that you made this + request.

{% endblock %} @@ -16,7 +20,7 @@ {% for form in forms.0.forms %}
-

Contact {{ forloop.counter }}

+

Administrative or technical contact {{ forloop.counter }}

 {% input_with_errors form.first_name %} @@ -41,4 +45,8 @@ Add another contact + +

No contacts

+ + {% input_with_errors forms.1.no_other_contacts_rationale %} {% endblock %} \ No newline at end of file diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py index ac4d31310..543739354 100644 --- a/src/registrar/views/application.py +++ b/src/registrar/views/application.py @@ -79,7 +79,7 @@ class ApplicationWizard(LoginRequiredMixin, TemplateView): Step.DOTGOV_DOMAIN: _(".gov domain"), Step.PURPOSE: _("Purpose of your domain"), Step.YOUR_CONTACT: _("Your contact information"), - Step.OTHER_CONTACTS: _("Other contacts for your domain"), + Step.OTHER_CONTACTS: _("Other contacts for your organization"), Step.SECURITY_EMAIL: _("Security email for public use"), Step.ANYTHING_ELSE: _("Anything else we should know?"), Step.REQUIREMENTS: _( @@ -410,7 +410,7 @@ class YourContact(ApplicationWizard): class OtherContacts(ApplicationWizard): template_name = "application_other_contacts.html" - forms = [forms.OtherContactsFormSet] + forms = [forms.OtherContactsFormSet, forms.NoOtherContactsForm] class SecurityEmail(ApplicationWizard): From 324f099c5e2de6ecb760278d1181b198a930c63c Mon Sep 17 00:00:00 2001 From: Michelle Rago <60157596+michelle-rago@users.noreply.github.com> Date: Mon, 6 Feb 2023 10:37:52 -0500 Subject: [PATCH 2/2] Slight edit to the "other contacts" intro text --- src/registrar/templates/application_other_contacts.html | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/registrar/templates/application_other_contacts.html b/src/registrar/templates/application_other_contacts.html index 582ecc3c3..71193f3e8 100644 --- a/src/registrar/templates/application_other_contacts.html +++ b/src/registrar/templates/application_other_contacts.html @@ -3,14 +3,13 @@ {% block form_instructions %}

We’d like to contact other employees with administrative or technical - responsibilities in your organization. For example, they could be involved in + responsibilities in your organization. They should be employees of + your organization. For example, they could be involved in managing your organization or its technical infrastructure. This information will help us assess your eligibility and understand the purpose of the .gov domain. These contacts should be in addition to you and your authorizing official.

-

Please list other administrative or technical contacts. They should be employees of - your organization. We’ll email these contacts to let them know that you made this - request.

+

We’ll email these contacts to let them know that you made this request.

{% endblock %} @@ -49,4 +48,4 @@

No contacts

{% input_with_errors forms.1.no_other_contacts_rationale %} -{% endblock %} \ No newline at end of file +{% endblock %}