zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-05-19 19:09:22 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into za/1852-user-contact-info-inline

Browse source
This commit is contained in:
zandercymatics 2024-03-25 08:24:52 -06:00
commit 3b652cda6c
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
36 changed files with 305 additions and 204 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/registrar/admin.py
View file

@ -830,7 +830,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
# Columns
list_display = [
"domain",
"organization_type",
"generic_org_type",
"created_at",
"submitter",
]
@ -841,7 +841,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
]
# Filters
list_filter = ["organization_type"]
list_filter = ["generic_org_type"]
# Search
search_fields = [
@ -858,7 +858,7 @@ class DomainInformationAdmin(ListHeaderAdmin):
"Type of organization",
{
"fields": [
"organization_type",
"generic_org_type",
"is_election_board",
"federal_type",
"federal_agency",
@ -1003,7 +1003,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
list_display = [
"requested_domain",
"status",
"organization_type",
"generic_org_type",
"federal_type",
"federal_agency",
"organization_name",
@ -1030,7 +1030,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
# Filters
list_filter = (
"status",
"organization_type",
"generic_org_type",
"federal_type",
ElectionOfficeFilter,
"rejection_reason",
@ -1068,7 +1068,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
"Type of organization",
{
"fields": [
"organization_type",
"generic_org_type",
"is_election_board",
"federal_type",
"federal_agency",
@ -1401,7 +1401,7 @@ class DomainAdmin(ListHeaderAdmin):
# Columns
list_display = [
"name",
"organization_type",
"generic_org_type",
"federal_type",
"federal_agency",
"organization_name",
@ -1426,10 +1426,10 @@ class DomainAdmin(ListHeaderAdmin):
# in autocomplete_fields for domain
ordering = ["name"]
def organization_type(self, obj):
return obj.domain_info.get_organization_type_display()
def generic_org_type(self, obj):
return obj.domain_info.get_generic_org_type_display()
organization_type.admin_order_field = "domain_info__organization_type" # type: ignore
generic_org_type.admin_order_field = "domain_info__generic_org_type" # type: ignore
def federal_agency(self, obj):
return obj.domain_info.federal_agency if obj.domain_info else None
@ -1466,7 +1466,7 @@ class DomainAdmin(ListHeaderAdmin):
state_territory.admin_order_field = "domain_info__state_territory" # type: ignore
# Filters
list_filter = ["domain_info__organization_type", "domain_info__federal_type", ElectionOfficeFilter, "state"]
list_filter = ["domain_info__generic_org_type", "domain_info__federal_type", ElectionOfficeFilter, "state"]
search_fields = ["name"]
search_help_text = "Search by domain name."