From aca65985b6c4a0988654d4a9c9b34565260ed3fd Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 27 Mar 2024 15:09:53 -0400 Subject: [PATCH 1/5] Collapse some content on DR and DI --- src/registrar/admin.py | 32 ++++++++++++++++++++ src/registrar/assets/sass/_theme/_admin.scss | 14 +++++++++ 2 files changed, 46 insertions(+) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 605c4fe1e..df87b5e00 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -885,6 +885,14 @@ class DomainInformationAdmin(ListHeaderAdmin): "fields": [ "generic_org_type", "is_election_board", + ] + }, + ), + ( + "More details", + { + "classes": ["collapse"], + "fields": [ "federal_type", "federal_agency", "tribe_name", @@ -900,6 +908,14 @@ class DomainInformationAdmin(ListHeaderAdmin): "fields": [ "organization_name", "state_territory", + ] + }, + ), + ( + "More details", + { + "classes": ["collapse"], + "fields": [ "address_line1", "address_line2", "city", @@ -1092,6 +1108,14 @@ class DomainRequestAdmin(ListHeaderAdmin): "fields": [ "generic_org_type", "is_election_board", + ] + }, + ), + ( + "More details", + { + "classes": ["collapse"], + "fields": [ "federal_type", "federal_agency", "tribe_name", @@ -1107,6 +1131,14 @@ class DomainRequestAdmin(ListHeaderAdmin): "fields": [ "organization_name", "state_territory", + ] + }, + ), + ( + "More details", + { + "classes": ["collapse"], + "fields": [ "address_line1", "address_line2", "city", diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index b7a494aef..104eafc32 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -349,4 +349,18 @@ input.admin-confirm-button { .errors span.select2-selection { border: 1px solid var(--error-fg) !important; +} + +.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); + } } \ No newline at end of file From 889bf864e8f79e70c4710f49537cc1e0c33f5b1c Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 27 Mar 2024 15:23:11 -0400 Subject: [PATCH 2/5] Lint --- src/registrar/admin.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index df87b5e00..73c2cccf9 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -899,7 +899,7 @@ class DomainInformationAdmin(ListHeaderAdmin): "federally_recognized_tribe", "state_recognized_tribe", "about_your_organization", - ] + ], }, ), ( @@ -921,7 +921,7 @@ class DomainInformationAdmin(ListHeaderAdmin): "city", "zipcode", "urbanization", - ] + ], }, ), ] @@ -1122,7 +1122,7 @@ class DomainRequestAdmin(ListHeaderAdmin): "federally_recognized_tribe", "state_recognized_tribe", "about_your_organization", - ] + ], }, ), ( @@ -1144,7 +1144,7 @@ class DomainRequestAdmin(ListHeaderAdmin): "city", "zipcode", "urbanization", - ] + ], }, ), ] From 65e899976c0cc1fa16ba75132f73c45afa12db96 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Wed, 27 Mar 2024 16:44:03 -0400 Subject: [PATCH 3/5] end line --- src/registrar/assets/sass/_theme/_admin.scss | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/registrar/assets/sass/_theme/_admin.scss b/src/registrar/assets/sass/_theme/_admin.scss index 104eafc32..70fa3811f 100644 --- a/src/registrar/assets/sass/_theme/_admin.scss +++ b/src/registrar/assets/sass/_theme/_admin.scss @@ -363,4 +363,4 @@ input.admin-confirm-button { a { color: var(--link-fg); } -} \ No newline at end of file +} From 81f6f8bf79b3dcf2f8bb24e121856b65204ad560 Mon Sep 17 00:00:00 2001 From: Rebecca Hsieh Date: Fri, 29 Mar 2024 09:26:27 -0700 Subject: [PATCH 4/5] Remove request number --- src/registrar/templates/domain_request_status.html | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) 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 From e59c3613ac998b98eac469e8b1953dda48d4f7bf Mon Sep 17 00:00:00 2001 From: Erin <121973038+erinysong@users.noreply.github.com> Date: Mon, 1 Apr 2024 13:01:45 -0700 Subject: [PATCH 5/5] Add analyst or superuser check for deleting user role --- src/registrar/views/utility/mixins.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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.