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

Merge conflicts

Browse source
This commit is contained in:
zandercymatics 2024-06-12 08:44:03 -06:00
parent 8d249692f2
commit 836b190822
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
3 changed files with 9 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -18,6 +18,8 @@ from django.contrib.postgres.aggregates import StringAgg
from registrar.models.utility.generic_helper import convert_queryset_to_dict
from registrar.templatetags.custom_filters import get_region
from registrar.utility.enums import DefaultEmail
from registrar.utility.constants import BranchChoices
logger = logging.getLogger(__name__)
@ -893,11 +895,11 @@ class DomainRequestExport:
# Handle the federal_type field. Defaults to the wrong format.
federal_type = request.get("federal_type")
human_readable_federal_type = (
DomainRequest.BranchChoices.get_branch_label(federal_type) if federal_type else None
BranchChoices.get_branch_label(federal_type) if federal_type else None
)
# Handle the org_type field
org_type = request.get("organization_type")
org_type = request.get("generic_org_type") or request.get("organization_type")
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.