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

corrected changes :-)

Browse source
This commit is contained in:
asaki222 2024-11-01 11:01:51 -04:00
parent 0b0250bf4e
commit 30d7e561ef
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
4 changed files with 50 additions and 39 deletions
Download patch file Download diff file Expand all files Collapse all files

33
src/registrar/admin.py
View file

@ -1766,7 +1766,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"Contacts",
{
"fields": [
"senior_official",
"converted_senior_official",
"other_contacts",
"no_other_contacts_rationale",
"cisa_representative_first_name",
@ -1781,7 +1781,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
{
"fields": [
"is_election_board",
"organization_type",
"converted_generic_org_type",
]
},
),
@ -1791,8 +1791,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"classes": ["collapse--dgfieldset"],
"description": "Extends type of organization",
"fields": [
"federal_type",
"federal_agency",
"converted_federal_type",
"converted_federal_agency",
"tribe_name",
"federally_recognized_tribe",
"state_recognized_tribe",
@ -1804,8 +1804,8 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"Organization name and mailing address",
{
"fields": [
"organization_name",
"state_territory",
"converted_organization_name",
"converted_state_territory",
]
},
),
@ -1815,11 +1815,11 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"classes": ["collapse--dgfieldset"],
"description": "Extends organization name and mailing address",
"fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
"converted_address_line1",
"converted_address_line2",
"converted_city",
"converted_zipcode",
"converted_urbanization",
],
},
),
@ -1832,6 +1832,17 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"alternative_domains",
"is_election_board",
"status_history",
"converted_senior_official",
"converted_federal_type",
"converted_federal_agency",
"converted_state_territory",
"converted_organization_name",
"converted_address_line1",
"converted_address_line2",
"converted_zipcode",
"converted_urbanization",
"converted_city",
"converted_generic_org_type"
)
# Read only that we'll leverage for CISA Analysts

10
src/registrar/templates/includes/domain_request_status_manage.html
View file

@ -163,8 +163,8 @@
{% endif %}
{% if DomainRequest.converted_federal_type %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.converted_federal_type heading_level=heading_level %}
{% if DomainRequest.get_federal_type %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type heading_level=heading_level %}
{% endif %}
{% if DomainRequest.is_election_board %}
@ -173,7 +173,7 @@
{% endwith %}
{% endif %}
{% if DomainRequest.converted_organization_name %}
{% if DomainRequest.organization_name %}
{% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}
@ -181,8 +181,8 @@
{% include "includes/summary_item.html" with title='About your organization' value=DomainRequest.about_your_organization heading_level=heading_level %}
{% endif %}
{% if DomainRequest.converted_senior_official %}
{% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.converted_senior_official contact='true' heading_level=heading_level %}
{% if DomainRequest.senior_official %}
{% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.senior_official contact='true' heading_level=heading_level %}
{% endif %}
{% if DomainRequest.current_websites.all %}

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

@ -1,28 +1,28 @@
<address>
{% if organization.converted_federal_agency %}
{{ organization.converted_federal_agency }}<br />
<address>
{% if organization.federal_agency %}
{{ organization.federal_agency }}<br />
{% endif %}
{% if organization.converted_organization_name %}
{{ organization.converted_organization_name }}
{% if organization.organization_name %}
{{ organization.organization_name }}
{% endif %}
{% if organization.converted_address_line1 %}
<br />{{ organization.converted_address_line1 }}
{% if organization.address_line1 %}
<br />{{ organization.address_line1 }}
{% endif %}
{% if organization.converted_address_line2 %}
<br />{{ organization.converted_address_line2 }}
{% if organization.address_line2 %}
<br />{{ organization.address_line2 }}
{% endif %}
{% if organization.converted_city %}
<br />{{ organization.converted_city }}{% if organization.converted_state_territory %},&nbsp;
{% if organization.city %}
<br />{{ organization.city }}{% if organization.state_territory %},&nbsp;
{% else %}<br />
{% endif %}
{% endif %}
{% if organization.converted_state_territory %}
{{ organization.converted_state_territory }}
{% if organization.state_territory %}
{{ organization.state_territory }}
{% endif %}
{% if organization.converted_zipcode %}
<br />{{ organization.converted_zipcode }}
{% if organization.zipcode %}
<br />{{ organization.zipcode }}
{% endif %}
{% if organization.converted_urbanization %}
<br />{{ organization.converted_urbanization }}
{% if organization.urbanization %}
<br />{{ organization.urbanization }}
{% endif %}
</address>

12
src/registrar/templates/includes/request_status_manage.html
View file

@ -146,7 +146,7 @@
{% block request_summary %}
{% with heading_level='h3' %}
{% with org_type=DomainRequest.converted_generic_org_type%}
{% with org_type=DomainRequest.get_generic_org_type_display %}
{% include "includes/summary_item.html" with title='Type of organization' value=org_type heading_level=heading_level %}
{% endwith %}
@ -163,8 +163,8 @@
{% endif %}
{% if DomainRequest.converted_federal_type %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.converted_federal_type heading_level=heading_level %}
{% if DomainRequest.get_federal_type_display %}
{% include "includes/summary_item.html" with title='Federal government branch' value=DomainRequest.get_federal_type_display heading_level=heading_level %}
{% endif %}
{% if DomainRequest.is_election_board %}
@ -173,7 +173,7 @@
{% endwith %}
{% endif %}
{% if DomainRequest.converted_organization_name %}
{% if DomainRequest.organization_name %}
{% include "includes/summary_item.html" with title='Organization' value=DomainRequest address='true' heading_level=heading_level %}
{% endif %}
@ -181,8 +181,8 @@
{% include "includes/summary_item.html" with title='About your organization' value=DomainRequest.about_your_organization heading_level=heading_level %}
{% endif %}
{% if DomainRequest.converted_senior_official %}
{% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.converted_senior_official contact='true' heading_level=heading_level %}
{% if DomainRequest.senior_official %}
{% include "includes/summary_item.html" with title='Senior official' value=DomainRequest.senior_official contact='true' heading_level=heading_level %}
{% endif %}
{% if DomainRequest.current_websites.all %}