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

Merge branch 'main' into dk/1838-default-domain-requests

Browse source
This commit is contained in:
David Kennedy 2024-04-03 07:06:26 -04:00
commit 166dce15c7
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
24 changed files with 1038 additions and 97 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/registrar/admin.py
View file

@ -886,13 +886,21 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [
"generic_org_type",
"is_election_board",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"federal_type",
"federal_agency",
"tribe_name",
"federally_recognized_tribe",
"state_recognized_tribe",
"about_your_organization",
]
],
},
),
(
@ -901,16 +909,27 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
]
],
},
),
]
# Readonly fields for analysts and superusers
readonly_fields = ("other_contacts",)
# Read only that we'll leverage for CISA Analysts
analyst_readonly_fields = [
"creator",
@ -939,6 +958,8 @@ class DomainInformationAdmin(ListHeaderAdmin):
# Table ordering
ordering = ["domain__name"]
change_form_template = "django/admin/domain_information_change_form.html"
def get_readonly_fields(self, request, obj=None):
"""Set the read-only state on form elements.
We have 1 conditions that determine which fields are read-only:
@ -959,6 +980,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
"""Custom domain requests admin class."""
form = DomainRequestAdminForm
change_form_template = "django/admin/domain_request_change_form.html"
class StatusListFilter(MultipleChoiceListFilter):
"""Custom status filter which is a multiple choice filter"""
@ -1031,8 +1053,6 @@ class DomainRequestAdmin(ListHeaderAdmin):
if self.value() == "0":
return queryset.filter(Q(is_election_board=False) | Q(is_election_board=None))
change_form_template = "django/admin/domain_request_change_form.html"
# Columns
list_display = [
"requested_domain",
@ -1104,13 +1124,21 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [
"generic_org_type",
"is_election_board",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"federal_type",
"federal_agency",
"tribe_name",
"federally_recognized_tribe",
"state_recognized_tribe",
"about_your_organization",
]
],
},
),
(
@ -1119,16 +1147,27 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
]
],
},
),
]
# Readonly fields for analysts and superusers
readonly_fields = ("other_contacts", "current_websites", "alternative_domains")
# Read only that we'll leverage for CISA Analysts
analyst_readonly_fields = [
"creator",
@ -1155,6 +1194,8 @@ class DomainRequestAdmin(ListHeaderAdmin):
# Table ordering
ordering = ["requested_domain__name"]
change_form_template = "django/admin/domain_request_change_form.html"
# Trigger action when a fieldset is changed
def save_model(self, request, obj, form, change):
"""Custom save_model definition that handles edge cases"""
@ -1309,7 +1350,7 @@ class DomainRequestAdmin(ListHeaderAdmin):
readonly_fields.extend([field.name for field in self.model._meta.fields])
# Add the multi-select fields to readonly_fields:
# Complex fields like ManyToManyField require special handling
readonly_fields.extend(["current_websites", "other_contacts", "alternative_domains"])
readonly_fields.extend(["alternative_domains"])
if request.user.has_perm("registrar.full_access_permission"):
return readonly_fields
@ -1437,7 +1478,6 @@ class DomainAdmin(ListHeaderAdmin):
)
def queryset(self, request, queryset):
logger.debug(self.value())
if self.value() == "1":
return queryset.filter(domain_info__is_election_board=True)
if self.value() == "0":