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

more changes

Browse source
This commit is contained in:
asaki222 2024-10-22 10:12:33 -04:00
parent 5e8612bfd1
commit 271eb01d28
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
5 changed files with 11 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/registrar/admin.py
View file

@ -1695,13 +1695,13 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"last_status_update", "last_status_update",
"status", "status",
"custom_election_board", "custom_election_board",
"state_territory",
"investigator", "investigator",
"converted_generic_org_type", "converted_generic_org_type",
"converted_organization_name", "converted_organization_name",
"converted_federal_agency", "converted_federal_agency",
"converted_federal_type", "converted_federal_type",
"converted_city", "converted_city",
"converted_state_territory"
] ]
orderable_fk_fields = [ orderable_fk_fields = [

2
src/registrar/models/domain_request.py
View file

@ -1386,7 +1386,7 @@ class DomainRequest(TimeStampedModel):
return self.city return self.city
@property @property
def converted_state_terrority(self): def converted_state_territory(self):
if self.portfolio: if self.portfolio:
return self.portfolio.state_territory return self.portfolio.state_territory
return self.state_territory return self.state_territory

2
src/registrar/templates/includes/organization_address.html
View file

@ -12,7 +12,7 @@
<br />{{ organization.converted_address_line2 }} <br />{{ organization.converted_address_line2 }}
{% endif %} {% endif %}
{% if organization.converted_city %} {% if organization.converted_city %}
<br />{{ organization.converted_city}}{% if organization.state_territory %},&nbsp; <br />{{ organization.converted_city}}{% if organization.converted_state_territory %},&nbsp;
{% else %}<br /> {% else %}<br />
{% endif %} {% endif %}
{% endif %} {% endif %}

2
src/registrar/tests/common.py
View file

@ -193,7 +193,7 @@ class GenericTestHelper(TestCase):
response = self.admin.changelist_view(dummy_request) response = self.admin.changelist_view(dummy_request)
response.render() # Render the response before accessing its content response.render() # Render the response before accessing its content
returned_sort_order = list(response.context_data["cl"].result_list) returned_sort_order = list(response.context_data["cl"].result_list)
self.assertEqual(expected_sort_order, returned_sort_order) self.assertEqual(expected_sort_order, returned_sort_order)
def _mock_user_request_for_factory(self, request): def _mock_user_request_for_factory(self, request):

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("federal_type") federal_type = model.get("converted_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("generic_org_type") or model.get("organization_type") org_type = model.get("converted_generic_org_type") or model.get("converted_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("state_territory") state_territory = model.get("converted_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("federal_agency__agency"), "Federal agency": model.get("converted_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("organization_name"), "Organization name": model.get("converted_organization_name"),
"City": model.get("city"), "City": model.get("converted_city"),
"State/territory": model.get("state_territory"), "State/territory": model.get("converted_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"),