diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 444acae37..051dbe087 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -1766,7 +1766,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): "Contacts", { "fields": [ - "display_converted_senior_official", + "converted_senior_official", "other_contacts", "no_other_contacts_rationale", "cisa_representative_first_name", @@ -1832,7 +1832,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): "alternative_domains", "is_election_board", "status_history", - "display_converted_senior_official", + "converted_senior_official", "converted_federal_type", "converted_federal_agency", "converted_state_territory", @@ -1877,22 +1877,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin): ordering = ["-last_submitted_date", "requested_domain__name"] change_form_template = "django/admin/domain_request_change_form.html" - - def display_converted_senior_official(self, obj): - so = obj.converted_senior_official - if so: - parts = [] - if so.first_name or so.last_name: - full_name = f"{so.first_name or ''} {so.last_name or ''}".strip() - parts.append(full_name) - if so.title: - parts.append(so.title) - if so.email: - parts.append(so.email) - if so.phone: - parts.append(str(so.phone)) - return "\n\n".join(parts) if parts else "N/A" - + # Trigger action when a fieldset is changed def save_model(self, request, obj, form, change): """Custom save_model definition that handles edge cases""" diff --git a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html index 317604c5e..ac0105526 100644 --- a/src/registrar/templates/django/admin/includes/detail_table_fieldset.html +++ b/src/registrar/templates/django/admin/includes/detail_table_fieldset.html @@ -327,7 +327,7 @@ This is using a custom implementation fieldset.html (see admin/fieldset.html) {% if not skip_additional_contact_info %} {% include "django/admin/includes/user_detail_list.html" with user=original_object.creator no_title_top_padding=field.is_readonly %} {% endif%} - {% elif field.field.name == "senior_official" %} + {% elif field.field.name == "converted_senior_official" %}
{% include "django/admin/includes/contact_detail_list.html" with user=original_object.senior_official no_title_top_padding=field.is_readonly %} diff --git a/src/registrar/tests/test_admin_request.py b/src/registrar/tests/test_admin_request.py index 55e945869..4624025d2 100644 --- a/src/registrar/tests/test_admin_request.py +++ b/src/registrar/tests/test_admin_request.py @@ -160,7 +160,6 @@ class TestDomainRequestAdmin(MockEppLib): ("no_other_contacts_rationale", "Required if creator does not list other employees"), ("alternative_domains", "Other domain names the creator provided for consideration"), ("no_other_contacts_rationale", "Required if creator does not list other employees"), - ("Urbanization", "Required for Puerto Rico only"), ] self.test_helper.assert_response_contains_distinct_values(response, expected_values) @@ -1508,8 +1507,6 @@ class TestDomainRequestAdmin(MockEppLib): self.assertContains(response, "Meoward Jones") # == Check for the senior_official == # - print("SENIOR OFFICIAL") - print(response.content.decode("utf-8")) self.assertContains(response, "testy@town.com", count=2) expected_so_fields = [ # Field, expected value @@ -1696,7 +1693,7 @@ class TestDomainRequestAdmin(MockEppLib): "alternative_domains", "is_election_board", "status_history", - "federal_agency", + "converted_federal_agency", "creator", "about_your_organization", "requested_domain",