diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 5310c4610..ffdce7add 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -329,10 +329,6 @@ class AuthorizingOfficialForm(RegistrarForm): label="First name / given name", error_messages={"required": ("Enter the first name / given name of your authorizing official.")}, ) - middle_name = forms.CharField( - required=False, - label="Middle name (optional)", - ) last_name = forms.CharField( label="Last name / family name", error_messages={"required": ("Enter the last name / family name of your authorizing official.")}, @@ -350,10 +346,6 @@ class AuthorizingOfficialForm(RegistrarForm): label="Email", error_messages={"invalid": ("Enter an email address in the required format, like name@example.com.")}, ) - phone = PhoneNumberField( - label="Phone", - error_messages={"required": "Enter the phone number for your authorizing official."}, - ) class CurrentSitesForm(RegistrarForm): diff --git a/src/registrar/forms/domain.py b/src/registrar/forms/domain.py index ac96393b4..5977449c3 100644 --- a/src/registrar/forms/domain.py +++ b/src/registrar/forms/domain.py @@ -213,6 +213,9 @@ class AuthorizingOfficialContactForm(ContactForm): def __init__(self, *args, **kwargs): super().__init__(*args, **kwargs) + # Overriding bc phone not required in this form + self.fields["phone"] = forms.IntegerField(required=False) + # Set custom error messages self.fields["first_name"].error_messages = { "required": "Enter the first name / given name of your authorizing official." @@ -227,7 +230,6 @@ class AuthorizingOfficialContactForm(ContactForm): self.fields["email"].error_messages = { "required": "Enter an email address in the required format, like name@example.com." } - self.fields["phone"].error_messages["required"] = "Enter a phone number for your authorizing official." class DomainSecurityEmailForm(forms.Form): diff --git a/src/registrar/templates/application_authorizing_official.html b/src/registrar/templates/application_authorizing_official.html index 08df404a3..9c364f612 100644 --- a/src/registrar/templates/application_authorizing_official.html +++ b/src/registrar/templates/application_authorizing_official.html @@ -25,17 +25,11 @@ {% input_with_errors forms.0.first_name %} - {% input_with_errors forms.0.middle_name %} - {% input_with_errors forms.0.last_name %} {% input_with_errors forms.0.title %} {% input_with_errors forms.0.email %} - {% with add_class="usa-input--medium" %} - {% input_with_errors forms.0.phone %} - {% endwith %} - {% endblock %} diff --git a/src/registrar/templates/domain_authorizing_official.html b/src/registrar/templates/domain_authorizing_official.html index 57a315e86..e7fc12a5e 100644 --- a/src/registrar/templates/domain_authorizing_official.html +++ b/src/registrar/templates/domain_authorizing_official.html @@ -19,18 +19,12 @@ {% input_with_errors form.first_name %} - {% input_with_errors form.middle_name %} - {% input_with_errors form.last_name %} {% input_with_errors form.title %} {% input_with_errors form.email %} - {% input_with_errors form.phone %} - - -