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

ran app black

Browse source
This commit is contained in:
asaki222 2024-11-03 20:59:07 -05:00
parent a1055687c4
commit f6bf437695
No known key found for this signature in database
GPG key ID: 2C4F802060E06EA4
2 changed files with 100 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/registrar/admin.py
View file

@ -1743,6 +1743,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
@admin.display(description=_("Urbanization")) @admin.display(description=_("Urbanization"))
def converted_urbanization(self, obj): def converted_urbanization(self, obj):
return obj.converted_urbanization return obj.converted_urbanization
# Columns # Columns
list_display = [ list_display = [
"requested_domain", "requested_domain",
@ -1768,8 +1769,6 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
def custom_election_board(self, obj): def custom_election_board(self, obj):
return "Yes" if obj.is_election_board else "No" return "Yes" if obj.is_election_board else "No"
custom_election_board.admin_order_field = "is_election_board" # type: ignore custom_election_board.admin_order_field = "is_election_board" # type: ignore
custom_election_board.short_description = "Election office" # type: ignore custom_election_board.short_description = "Election office" # type: ignore
@ -1903,7 +1902,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"converted_zipcode", "converted_zipcode",
"converted_urbanization", "converted_urbanization",
"converted_city", "converted_city",
"converted_generic_org_type" "converted_generic_org_type",
) )
# Read only that we'll leverage for CISA Analysts # Read only that we'll leverage for CISA Analysts

188
src/registrar/tests/test_admin_request.py
View file

@ -575,8 +575,8 @@ class TestDomainRequestAdmin(MockEppLib):
response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal") response = self.client.get("/admin/registrar/domainrequest/?generic_org_type__exact=federal")
# There are 2 template references to Federal (4) and two in the results data # There are 2 template references to Federal (4) and two in the results data
# of the request # of the request
self.assertContains(response, "Federal", count=48) print(response.content.decode("utf-8"))
self.assertContains(response, "Converted federal", count=4) self.assertContains(response, "Federal", count=52)
# This may be a bit more robust # This may be a bit more robust
self.assertContains(response, '<td class="field-converted_generic_org_type">federal</td>', count=1) self.assertContains(response, '<td class="field-converted_generic_org_type">federal</td>', count=1)
# Now let's make sure the long description does not exist # Now let's make sure the long description does not exist
@ -1626,69 +1626,70 @@ class TestDomainRequestAdmin(MockEppLib):
readonly_fields = self.admin.get_readonly_fields(request, domain_request) readonly_fields = self.admin.get_readonly_fields(request, domain_request)
expected_fields = [ expected_fields = [
'other_contacts', "other_contacts",
'current_websites', "current_websites",
'alternative_domains', "alternative_domains",
'is_election_board', "is_election_board",
'status_history', "status_history",
'converted_senior_official', "converted_senior_official",
'converted_federal_type', "converted_federal_type",
'converted_federal_agency', "converted_federal_agency",
'converted_state_territory', "converted_state_territory",
'converted_organization_name', "converted_organization_name",
'converted_address_line1', "converted_address_line1",
'converted_address_line2', "converted_address_line2",
'converted_zipcode', "converted_zipcode",
'converted_urbanization', "converted_urbanization",
'converted_city', "converted_city",
'converted_generic_org_type', "converted_generic_org_type",
'id', "id",
'created_at', "created_at",
'updated_at', "updated_at",
'status', "status",
'rejection_reason', "rejection_reason",
'rejection_reason_email', "rejection_reason_email",
'action_needed_reason', "action_needed_reason",
'action_needed_reason_email', "action_needed_reason_email",
'federal_agency', 'portfolio', "federal_agency",
'sub_organization', "portfolio",
"sub_organization",
"requested_suborganization", "requested_suborganization",
"suborganization_city", "suborganization_city",
"suborganization_state_territory", "suborganization_state_territory",
'creator', "creator",
'investigator', "investigator",
'generic_org_type', "generic_org_type",
'is_election_board', "is_election_board",
'organization_type', "organization_type",
'federally_recognized_tribe', "federally_recognized_tribe",
'state_recognized_tribe', "state_recognized_tribe",
'tribe_name', "tribe_name",
'federal_type', "federal_type",
'organization_name', "organization_name",
'address_line1', "address_line1",
'address_line2', "address_line2",
'city', "city",
'state_territory', "state_territory",
'zipcode', "zipcode",
'urbanization', "urbanization",
'about_your_organization', "about_your_organization",
'senior_official', "senior_official",
'approved_domain', "approved_domain",
'requested_domain', "requested_domain",
'purpose', "purpose",
'no_other_contacts_rationale', "no_other_contacts_rationale",
'anything_else', "anything_else",
'has_anything_else_text', "has_anything_else_text",
'cisa_representative_email', "cisa_representative_email",
'cisa_representative_first_name', "cisa_representative_first_name",
'cisa_representative_last_name', "cisa_representative_last_name",
'has_cisa_representative', "has_cisa_representative",
'is_policy_acknowledged', "is_policy_acknowledged",
'first_submitted_date', "first_submitted_date",
'last_submitted_date', "last_submitted_date",
'last_status_update', "last_status_update",
'notes', "notes",
'alternative_domains' "alternative_domains",
] ]
self.maxDiff = None self.maxDiff = None
self.assertEqual(readonly_fields, expected_fields) self.assertEqual(readonly_fields, expected_fields)
@ -1699,42 +1700,43 @@ class TestDomainRequestAdmin(MockEppLib):
request.user = self.staffuser request.user = self.staffuser
readonly_fields = self.admin.get_readonly_fields(request) readonly_fields = self.admin.get_readonly_fields(request)
print(" read only fields")
print(readonly_fields)
self.maxDiff = None self.maxDiff = None
expected_fields = [ expected_fields = [
'other_contacts', "other_contacts",
'current_websites', "current_websites",
'alternative_domains', "alternative_domains",
'is_election_board', "is_election_board",
'status_history', "status_history",
'converted_senior_official', "converted_senior_official",
'converted_federal_type', "converted_federal_type",
'converted_federal_agency', "converted_federal_agency",
'converted_state_territory', "converted_state_territory",
'converted_organization_name', "converted_organization_name",
'converted_address_line1', "converted_address_line1",
'converted_address_line2', "converted_address_line2",
'converted_zipcode', "converted_zipcode",
'converted_urbanization', "converted_urbanization",
'converted_city', "converted_city",
'converted_generic_org_type', "converted_generic_org_type",
'converted_federal_agency', "converted_federal_agency",
'creator', "creator",
'about_your_organization', "about_your_organization",
'requested_domain', "requested_domain",
'approved_domain', "approved_domain",
'alternative_domains', "alternative_domains",
'purpose', "purpose",
'no_other_contacts_rationale', "no_other_contacts_rationale",
'anything_else', "anything_else",
'is_policy_acknowledged', "is_policy_acknowledged",
'cisa_representative_first_name', "cisa_representative_first_name",
'cisa_representative_last_name', "cisa_representative_last_name",
'cisa_representative_email' "cisa_representative_email",
"requested_suborganization", "requested_suborganization",
"suborganization_city", "suborganization_city",
"suborganization_state_territory", "suborganization_state_territory",
] ]
self.assertEqual(readonly_fields, expected_fields) self.assertEqual(readonly_fields, expected_fields)
def test_readonly_fields_for_superuser(self): def test_readonly_fields_for_superuser(self):
@ -1760,7 +1762,7 @@ class TestDomainRequestAdmin(MockEppLib):
"converted_zipcode", "converted_zipcode",
"converted_urbanization", "converted_urbanization",
"converted_city", "converted_city",
"converted_generic_org_type" "converted_generic_org_type",
] ]
self.assertEqual(readonly_fields, expected_fields) self.assertEqual(readonly_fields, expected_fields)