diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 72025db45..f3e8c81cd 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1457,7 +1457,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): "cisa_representative_first_name", "cisa_representative_last_name", "cisa_representative_email", -] + ] autocomplete_fields = [ "approved_domain", "requested_domain", diff --git a/src/registrar/forms/domain_request_wizard.py b/src/registrar/forms/domain_request_wizard.py index 9df4a4c1a..bb34ac56e 100644 --- a/src/registrar/forms/domain_request_wizard.py +++ b/src/registrar/forms/domain_request_wizard.py @@ -671,7 +671,6 @@ class CisaRepresentativeForm(BaseDeletableRegistrarForm): ) - class CisaRepresentativeYesNoForm(BaseYesNoForm): """Yes/no toggle for the CISA regions question on additional details""" diff --git a/src/registrar/models/domain_information.py b/src/registrar/models/domain_information.py index d2300c784..95af94010 100644 --- a/src/registrar/models/domain_information.py +++ b/src/registrar/models/domain_information.py @@ -219,7 +219,7 @@ class DomainInformation(TimeStampedModel): verbose_name="CISA regional representative first name", db_index=True, ) - + cisa_representative_last_name = models.CharField( null=True, blank=True, diff --git a/src/registrar/models/domain_request.py b/src/registrar/models/domain_request.py index f84451543..457558f9c 100644 --- a/src/registrar/models/domain_request.py +++ b/src/registrar/models/domain_request.py @@ -470,7 +470,7 @@ class DomainRequest(TimeStampedModel): verbose_name="CISA regional representative first name", db_index=True, ) - + cisa_representative_last_name = models.CharField( null=True, blank=True, diff --git a/src/registrar/tests/common.py b/src/registrar/tests/common.py index 0e5a1a5c0..2fdc64d44 100644 --- a/src/registrar/tests/common.py +++ b/src/registrar/tests/common.py @@ -895,9 +895,9 @@ def completed_domain_request( # noqa if has_alternative_gov_domain: domain_request.alternative_domains.add(alt) if has_cisa_representative: - domain_request.cisa_representative_first_name="CISA-first-name" - domain_request.cisa_representative_last_name="CISA-last-name" - domain_request.cisa_representative_email="cisaRep@igorville.gov" + domain_request.cisa_representative_first_name = "CISA-first-name" + domain_request.cisa_representative_last_name = "CISA-last-name" + domain_request.cisa_representative_email = "cisaRep@igorville.gov" return domain_request diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py index e4c748e8c..6ef9f9cdf 100644 --- a/src/registrar/tests/test_admin.py +++ b/src/registrar/tests/test_admin.py @@ -2264,8 +2264,7 @@ class TestDomainRequestAdmin(MockEppLib): "anything_else", "has_anything_else_text", "cisa_representative_first_name", - "cisa_representative_last_name," - "cisa_representative_email", + "cisa_representative_last_name," "cisa_representative_email", "has_cisa_representative", "is_policy_acknowledged", "submission_date", @@ -2299,8 +2298,7 @@ class TestDomainRequestAdmin(MockEppLib): "anything_else", "is_policy_acknowledged", "cisa_representative_first_name", - "cisa_representative_last_name," - "cisa_representative_email", + "cisa_representative_last_name," "cisa_representative_email", ] self.assertEqual(readonly_fields, expected_fields)