From 15bf1a04902a8feae60a551292560d9fb8a34e70 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 23 May 2024 10:07:41 -0600
Subject: [PATCH 1/2] Remove generic org type from fields

---
 src/registrar/admin.py | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index 9905cf340..70a4c520b 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -1124,7 +1124,6 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             "Type of organization",
             {
                 "fields": [
-                    "generic_org_type",
                     "is_election_board",
                     "organization_type",
                 ]
@@ -1171,7 +1170,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
     ]
 
     # Readonly fields for analysts and superusers
-    readonly_fields = ("other_contacts", "generic_org_type", "is_election_board")
+    readonly_fields = ("other_contacts", "is_election_board")
 
     # Read only that we'll leverage for CISA Analysts
     analyst_readonly_fields = [
@@ -1385,7 +1384,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
             "Type of organization",
             {
                 "fields": [
-                    "generic_org_type",
                     "is_election_board",
                     "organization_type",
                 ]
@@ -1436,7 +1434,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
         "other_contacts",
         "current_websites",
         "alternative_domains",
-        "generic_org_type",
         "is_election_board",
     )
 

From 0220fcb6646b88b9f96ec2adcb0764dd496633e3 Mon Sep 17 00:00:00 2001
From: zandercymatics <141044360+zandercymatics@users.noreply.github.com>
Date: Thu, 23 May 2024 10:31:41 -0600
Subject: [PATCH 2/2] Fix unit tests

---
 src/registrar/tests/test_admin.py | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/src/registrar/tests/test_admin.py b/src/registrar/tests/test_admin.py
index 4a6e76e3d..845cf2693 100644
--- a/src/registrar/tests/test_admin.py
+++ b/src/registrar/tests/test_admin.py
@@ -2230,7 +2230,6 @@ class TestDomainRequestAdmin(MockEppLib):
                 "other_contacts",
                 "current_websites",
                 "alternative_domains",
-                "generic_org_type",
                 "is_election_board",
                 "id",
                 "created_at",
@@ -2284,7 +2283,6 @@ class TestDomainRequestAdmin(MockEppLib):
                 "other_contacts",
                 "current_websites",
                 "alternative_domains",
-                "generic_org_type",
                 "is_election_board",
                 "creator",
                 "about_your_organization",
@@ -2312,7 +2310,6 @@ class TestDomainRequestAdmin(MockEppLib):
                 "other_contacts",
                 "current_websites",
                 "alternative_domains",
-                "generic_org_type",
                 "is_election_board",
             ]
 
@@ -3170,7 +3167,6 @@ class TestDomainInformationAdmin(TestCase):
 
             expected_fields = [
                 "other_contacts",
-                "generic_org_type",
                 "is_election_board",
                 "creator",
                 "type_of_work",