diff --git a/src/registrar/admin.py b/src/registrar/admin.py
index a51487b80..55444d280 100644
--- a/src/registrar/admin.py
+++ b/src/registrar/admin.py
@@ -885,13 +885,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",
- ]
+ ],
},
),
(
@@ -900,12 +908,20 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
+ ]
+ },
+ ),
+ (
+ "More details",
+ {
+ "classes": ["collapse"],
+ "fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
- ]
+ ],
},
),
]
@@ -1096,13 +1112,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",
- ]
+ ],
},
),
(
@@ -1111,12 +1135,20 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
+ ]
+ },
+ ),
+ (
+ "More details",
+ {
+ "classes": ["collapse"],
+ "fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
- ]
+ ],
},
),
]
diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss
index f44ae2bc0..a537fc872 100644
--- a/src/registrar/assets/sass/_theme/_admin.scss
+++ b/src/registrar/assets/sass/_theme/_admin.scss
@@ -488,3 +488,18 @@ address.dja-address-contact-list {
@include submit-row-wrapper--collapsed-one-line();
}
}
+
+// Collapse button styles for fieldsets
+.module.collapse {
+ margin-top: -35px;
+ padding-top: 0;
+ border: none;
+ h2 {
+ background: none;
+ color: var(--body-fg)!important;
+ text-transform: none;
+ }
+ a {
+ color: var(--link-fg);
+ }
+}
diff --git a/src/registrar/templates/domain_request_status.html b/src/registrar/templates/domain_request_status.html
index e6ca4cdb3..5b6ee8368 100644
--- a/src/registrar/templates/domain_request_status.html
+++ b/src/registrar/templates/domain_request_status.html
@@ -41,8 +41,7 @@
-
Last updated: {{DomainRequest.updated_at|date:"F j, Y"}}
- Request #: {{DomainRequest.id}}
Last updated: {{DomainRequest.updated_at|date:"F j, Y"}}
{% include "includes/domain_request.html" %}
Withdraw request diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py index aa0c9cd6b..c7083ce48 100644 --- a/src/registrar/views/utility/mixins.py +++ b/src/registrar/views/utility/mixins.py @@ -307,7 +307,12 @@ class UserDeleteDomainRolePermission(PermissionsLoginMixin): domain=domain_pk, domain__permissions__user=self.request.user, ).exists() - if not has_delete_permission: + + user_is_analyst_or_superuser = self.request.user.has_perm( + "registrar.analyst_access_permission" + ) or self.request.user.has_perm("registrar.full_access_permission") + + if not (has_delete_permission or user_is_analyst_or_superuser): return False # Check if more than one manager exists on the domain.