Merge branch 'main' into za/2348-csv-export-org-member-domain-export

This commit is contained in:
zandercymatics 2024-08-02 07:50:38 -06:00
commit a4f1170349
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
43 changed files with 435 additions and 172 deletions

View file

@ -374,8 +374,9 @@ class DomainExport(BaseExport):
if first_ready_on is None:
first_ready_on = "(blank)"
domain_org_type = model.get("generic_org_type")
human_readable_domain_org_type = DomainRequest.OrganizationChoices.get_org_label(domain_org_type)
# organization_type has generic_org_type AND is_election
domain_org_type = model.get("organization_type")
human_readable_domain_org_type = DomainRequest.OrgChoicesElectionOffice.get_org_label(domain_org_type)
domain_federal_type = model.get("federal_type")
human_readable_domain_federal_type = BranchChoices.get_branch_label(domain_federal_type)
domain_type = human_readable_domain_org_type