zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-06-08 13:34:42 +02:00
Code Issues Projects Releases Packages Wiki Activity

Tweak domain type display by using get_organization_type_display and pulling federal_type if applicable

Browse source
This commit is contained in:
Rachid Mrad 2023-10-31 10:52:00 -04:00
parent d624c22088
commit 8e768112f3
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF
2 changed files with 9 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/registrar/tests/test_reports.py
View file

@ -113,9 +113,9 @@ class ExportDataTest(TestCase):
"Domain name,Domain type,Federal agency,Organization name,City,State,AO,"
"AO email,Submitter,Submitter title,Submitter email,Submitter phone,"
"Security Contact Email,Status\n"
"adomain2.gov,interstate,dnsneeded\n"
"cdomain1.gov,federal,World War I Centennial Commission,ready\n"
"ddomain3.gov,federal,Armed Forces Retirement Home,onhold\n"
"adomain2.gov,Interstate,dnsneeded\n"
"cdomain1.gov,Federal,World War I Centennial Commission,ready\n"
"ddomain3.gov,Federal,Armed Forces Retirement Home,onhold\n"
)
# Normalize line endings and remove commas,
@ -174,8 +174,8 @@ class ExportDataTest(TestCase):
expected_content = (
"Domain name,Domain type,Federal agency,Organization name,City,"
"State,Security Contact Email\n"
"cdomain1.gov,federal,World War I Centennial Commission\n"
"ddomain3.gov,federal,Armed Forces Retirement Home\n"
"cdomain1.gov,Federal,World War I Centennial Commission\n"
"ddomain3.gov,Federal,Armed Forces Retirement Home\n"
)
# Normalize line endings and remove commas,

5
src/registrar/utility/csv_export.py
View file

@ -19,7 +19,10 @@ def export_domains_to_writer(writer, columns, sort_fields, filter_condition):
# create a dictionary of fields which can be included in output
FIELDS = {
"Domain name": domainInfo.domain.name,
"Domain type": domainInfo.organization_type,
"Domain type": domainInfo.get_organization_type_display()
+ " - " + domainInfo.federal_type
if domainInfo.federal_type
else domainInfo.get_organization_type_display(),
"Federal agency": domainInfo.federal_agency,
"Organization name": domainInfo.organization_name,
"City": domainInfo.city,