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

Merge branch 'main' into za/2146-remove-generic-org

Browse source
This commit is contained in:
zandercymatics 2024-05-23 12:34:24 -06:00
commit 59dfb974c1
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
8 changed files with 166 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/registrar/admin.py
View file

@ -594,7 +594,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
None,
{"fields": ("username", "password", "status", "verification_type")},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
(
"Permissions",
{
@ -625,7 +625,7 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
)
},
),
("Personal Info", {"fields": ("first_name", "last_name", "email")}),
("Personal Info", {"fields": ("first_name", "middle_name", "last_name", "email", "title")}),
(
"Permissions",
{
@ -651,7 +651,9 @@ class MyUserAdmin(BaseUserAdmin, ImportExportModelAdmin):
analyst_readonly_fields = [
"Personal Info",
"first_name",
"middle_name",
"last_name",
"title",
"email",
"Permissions",
"is_active",
@ -1170,7 +1172,7 @@ class DomainInformationAdmin(ListHeaderAdmin, ImportExportModelAdmin):
]
# Readonly fields for analysts and superusers
readonly_fields = ("other_contacts", "is_election_board")
readonly_fields = ("other_contacts", "is_election_board", "federal_agency")
# Read only that we'll leverage for CISA Analysts
analyst_readonly_fields = [
@ -1435,6 +1437,7 @@ class DomainRequestAdmin(ListHeaderAdmin, ImportExportModelAdmin):
"current_websites",
"alternative_domains",
"is_election_board",
"federal_agency",
)
# Read only that we'll leverage for CISA Analysts
@ -1876,7 +1879,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportModelAdmin):
search_fields = ["name"]
search_help_text = "Search by domain name."
change_form_template = "django/admin/domain_change_form.html"
readonly_fields = ["state", "expiration_date", "first_ready", "deleted"]
readonly_fields = ("state", "expiration_date", "first_ready", "deleted", "federal_agency")
# Table ordering
ordering = ["name"]