diff --git a/src/registrar/config/urls.py b/src/registrar/config/urls.py index 72c0604a0..2434511b9 100644 --- a/src/registrar/config/urls.py +++ b/src/registrar/config/urls.py @@ -35,7 +35,6 @@ for step, view in [ (Step.PURPOSE, views.Purpose), (Step.YOUR_CONTACT, views.YourContact), (Step.OTHER_CONTACTS, views.OtherContacts), - (Step.SECURITY_EMAIL, views.SecurityEmail), (Step.ANYTHING_ELSE, views.AnythingElse), (Step.REQUIREMENTS, views.Requirements), (Step.REVIEW, views.Review), diff --git a/src/registrar/forms/application_wizard.py b/src/registrar/forms/application_wizard.py index 76e10ad8b..d70c911b0 100644 --- a/src/registrar/forms/application_wizard.py +++ b/src/registrar/forms/application_wizard.py @@ -28,8 +28,10 @@ class RegistrarForm(forms.Form): def __init__(self, *args, **kwargs): kwargs.setdefault("label_suffix", "") # save a reference to an application object + archived = kwargs.pop('archived', None) self.application = kwargs.pop("application", None) super(RegistrarForm, self).__init__(*args, **kwargs) + self.fields['archived'] = forms.BooleanField(initial=archived, required=False) def to_database(self, obj: DomainApplication | Contact): """ @@ -672,18 +674,6 @@ class NoOtherContactsForm(RegistrarForm): ) -class SecurityEmailForm(RegistrarForm): - security_email = forms.EmailField( - required=False, - label="Security email for public use", - error_messages={ - "invalid": ( - "Enter an email address in the required format, like name@example.com." - ) - }, - ) - - class AnythingElseForm(RegistrarForm): anything_else = forms.CharField( required=False, diff --git a/src/registrar/tests/test_forms.py b/src/registrar/tests/test_forms.py index b021e559c..2ad81e643 100644 --- a/src/registrar/tests/test_forms.py +++ b/src/registrar/tests/test_forms.py @@ -9,7 +9,6 @@ from registrar.forms.application_wizard import ( OrganizationContactForm, YourContactForm, OtherContactsForm, - SecurityEmailForm, RequirementsForm, TribalGovernmentForm, ) @@ -117,19 +116,6 @@ class TestFormValidation(TestCase): form.errors["phone"][0].startswith("Enter a valid phone number") ) - def test_security_email_form_blank(self): - """Can leave the security_email field blank.""" - form = SecurityEmailForm(data={}) - self.assertEqual(len(form.errors), 0) - - def test_security_email_form_invalid(self): - """Can leave the security_email field blank.""" - form = SecurityEmailForm(data={"security_email": "boss@boss"}) - self.assertEqual( - form.errors["security_email"], - ["Enter an email address in the required format, like name@example.com."], - ) - def test_requirements_form_blank(self): """Requirements box unchecked is an error.""" form = RequirementsForm(data={}) diff --git a/src/registrar/views/application.py b/src/registrar/views/application.py index c34a8e1c1..932d528b8 100644 --- a/src/registrar/views/application.py +++ b/src/registrar/views/application.py @@ -37,7 +37,6 @@ class Step(StrEnum): PURPOSE = "purpose" YOUR_CONTACT = "your_contact" OTHER_CONTACTS = "other_contacts" - SECURITY_EMAIL = "security_email" ANYTHING_ELSE = "anything_else" REQUIREMENTS = "requirements" REVIEW = "review" @@ -82,7 +81,6 @@ class ApplicationWizard(LoginRequiredMixin, TemplateView): Step.PURPOSE: _("Purpose of your domain"), Step.YOUR_CONTACT: _("Your contact information"), 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: _( "Requirements for registration and operation of .gov domains" @@ -428,10 +426,6 @@ class OtherContacts(ApplicationWizard): forms = [forms.OtherContactsFormSet, forms.NoOtherContactsForm] -class SecurityEmail(ApplicationWizard): - template_name = "application_security_email.html" - forms = [forms.SecurityEmailForm] - class AnythingElse(ApplicationWizard): template_name = "application_anything_else.html"