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

reverted changes due to changing ac

Browse source
This commit is contained in:
asaki222 2024-10-22 17:03:52 -04:00
parent 00d020891f
commit dec877b4cb
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
1 changed files with 7 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1267,11 +1267,11 @@ class DomainRequestExport(BaseExport):
""" """
# Handle the federal_type field. Defaults to the wrong format. # Handle the federal_type field. Defaults to the wrong format.
federal_type = model.get("converted_federal_type") federal_type = model.get("federal_type")
human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None human_readable_federal_type = BranchChoices.get_branch_label(federal_type) if federal_type else None
# Handle the org_type field # Handle the org_type field
org_type = model.get("converted_generic_org_type") or model.get("converted_organization_type") org_type = model.get("generic_org_type") or model.get("organization_type")
human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None human_readable_org_type = DomainRequest.OrganizationChoices.get_org_label(org_type) if org_type else None
# Handle the status field. Defaults to the wrong format. # Handle the status field. Defaults to the wrong format.
@ -1279,7 +1279,7 @@ class DomainRequestExport(BaseExport):
status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None status_display = DomainRequest.DomainRequestStatus.get_status_label(status) if status else None
# Handle the region field. # Handle the region field.
state_territory = model.get("converted_state_territory") state_territory = model.get("state_territory")
region = get_region(state_territory) if state_territory else None region = get_region(state_territory) if state_territory else None
# Handle the requested_domain field (add a default if None) # Handle the requested_domain field (add a default if None)
@ -1319,7 +1319,7 @@ class DomainRequestExport(BaseExport):
"Other contacts": model.get("all_other_contacts"), "Other contacts": model.get("all_other_contacts"),
"Current websites": model.get("all_current_websites"), "Current websites": model.get("all_current_websites"),
# Untouched FK fields - passed into the request dict. # Untouched FK fields - passed into the request dict.
"Federal agency": model.get("converted_federal_agency__agency"), "Federal agency": model.get("federal_agency__agency"),
"SO first name": model.get("senior_official__first_name"), "SO first name": model.get("senior_official__first_name"),
"SO last name": model.get("senior_official__last_name"), "SO last name": model.get("senior_official__last_name"),
"SO email": model.get("senior_official__email"), "SO email": model.get("senior_official__email"),
@ -1329,9 +1329,9 @@ class DomainRequestExport(BaseExport):
"Creator email": model.get("creator__email"), "Creator email": model.get("creator__email"),
"Investigator": model.get("investigator__email"), "Investigator": model.get("investigator__email"),
# Untouched fields # Untouched fields
"Organization name": model.get("converted_organization_name"), "Organization name": model.get("organization_name"),
"City": model.get("converted_city"), "City": model.get("city"),
"State/territory": model.get("converted_state_territory"), "State/territory": model.get("state_territory"),
"Request purpose": model.get("purpose"), "Request purpose": model.get("purpose"),
"CISA regional representative": model.get("cisa_representative_email"), "CISA regional representative": model.get("cisa_representative_email"),
"Last submitted date": model.get("last_submitted_date"), "Last submitted date": model.get("last_submitted_date"),