Merge pull request #2211 from cisagov/za/2146-remove-generic-org

Ticket #2146: Remove generic org type from fields
This commit is contained in:
zandercymatics 2024-05-24 14:15:55 -06:00 committed by GitHub
commit a15ec78f72
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 1 additions and 8 deletions

View file

@ -1126,7 +1126,6 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"Type of organization", "Type of organization",
{ {
"fields": [ "fields": [
"generic_org_type",
"is_election_board", "is_election_board",
"organization_type", "organization_type",
] ]
@ -1173,7 +1172,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
] ]
# Readonly fields for analysts and superusers # Readonly fields for analysts and superusers
readonly_fields = ("other_contacts", "generic_org_type", "is_election_board", "federal_agency") readonly_fields = ("other_contacts", "is_election_board", "federal_agency")
# Read only that we'll leverage for CISA Analysts # Read only that we'll leverage for CISA Analysts
analyst_readonly_fields = [ analyst_readonly_fields = [
@ -1387,7 +1386,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"Type of organization", "Type of organization",
{ {
"fields": [ "fields": [
"generic_org_type",
"is_election_board", "is_election_board",
"organization_type", "organization_type",
] ]
@ -1438,7 +1436,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"other_contacts", "other_contacts",
"current_websites", "current_websites",
"alternative_domains", "alternative_domains",
"generic_org_type",
"is_election_board", "is_election_board",
"federal_agency", "federal_agency",
) )

View file

@ -2230,7 +2230,6 @@ class TestDomainRequestAdmin(MockEppLib):
"other_contacts", "other_contacts",
"current_websites", "current_websites",
"alternative_domains", "alternative_domains",
"generic_org_type",
"is_election_board", "is_election_board",
"federal_agency", "federal_agency",
"id", "id",
@ -2285,7 +2284,6 @@ class TestDomainRequestAdmin(MockEppLib):
"other_contacts", "other_contacts",
"current_websites", "current_websites",
"alternative_domains", "alternative_domains",
"generic_org_type",
"is_election_board", "is_election_board",
"federal_agency", "federal_agency",
"creator", "creator",
@ -2314,7 +2312,6 @@ class TestDomainRequestAdmin(MockEppLib):
"other_contacts", "other_contacts",
"current_websites", "current_websites",
"alternative_domains", "alternative_domains",
"generic_org_type",
"is_election_board", "is_election_board",
"federal_agency", "federal_agency",
] ]
@ -3173,7 +3170,6 @@ class TestDomainInformationAdmin(TestCase):
expected_fields = [ expected_fields = [
"other_contacts", "other_contacts",
"generic_org_type",
"is_election_board", "is_election_board",
"federal_agency", "federal_agency",
"creator", "creator",