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

merge

Browse source
This commit is contained in:
Rachid Mrad 2024-04-02 13:01:38 -04:00
commit 90d49bcd82
No known key found for this signature in database
4 changed files with 58 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/registrar/admin.py
View file

@ -885,13 +885,21 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [ "fields": [
"generic_org_type", "generic_org_type",
"is_election_board", "is_election_board",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"federal_type", "federal_type",
"federal_agency", "federal_agency",
"tribe_name", "tribe_name",
"federally_recognized_tribe", "federally_recognized_tribe",
"state_recognized_tribe", "state_recognized_tribe",
"about_your_organization", "about_your_organization",
] ],
}, },
), ),
( (
@ -900,12 +908,20 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [ "fields": [
"organization_name", "organization_name",
"state_territory", "state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1", "address_line1",
"address_line2", "address_line2",
"city", "city",
"zipcode", "zipcode",
"urbanization", "urbanization",
] ],
}, },
), ),
] ]
@ -1096,13 +1112,21 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [ "fields": [
"generic_org_type", "generic_org_type",
"is_election_board", "is_election_board",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"federal_type", "federal_type",
"federal_agency", "federal_agency",
"tribe_name", "tribe_name",
"federally_recognized_tribe", "federally_recognized_tribe",
"state_recognized_tribe", "state_recognized_tribe",
"about_your_organization", "about_your_organization",
] ],
}, },
), ),
( (
@ -1111,12 +1135,20 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [ "fields": [
"organization_name", "organization_name",
"state_territory", "state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1", "address_line1",
"address_line2", "address_line2",
"city", "city",
"zipcode", "zipcode",
"urbanization", "urbanization",
] ],
}, },
), ),
] ]

15
src/registrar/assets/sass/_theme/_admin.scss
View file

@ -488,3 +488,18 @@ address.dja-address-contact-list {
@include submit-row-wrapper--collapsed-one-line(); @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);
}
}

3
src/registrar/templates/domain_request_status.html
View file

@ -41,8 +41,7 @@
</div> </div>
</div> </div>
<br> <br>
<p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br> <p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br></p>
<b class="review__step__name">Request #:</b> {{DomainRequest.id}}</p>
<p>{% include "includes/domain_request.html" %}</p> <p>{% include "includes/domain_request.html" %}</p>
<p><a href="{% url 'domain-request-withdraw-confirmation' pk=DomainRequest.id %}" class="usa-button usa-button--outline withdraw_outline"> <p><a href="{% url 'domain-request-withdraw-confirmation' pk=DomainRequest.id %}" class="usa-button usa-button--outline withdraw_outline">
Withdraw request</a> Withdraw request</a>

7
src/registrar/views/utility/mixins.py
View file

@ -307,7 +307,12 @@ class UserDeleteDomainRolePermission(PermissionsLoginMixin):
domain=domain_pk, domain=domain_pk,
domain__permissions__user=self.request.user, domain__permissions__user=self.request.user,
).exists() ).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 return False
# Check if more than one manager exists on the domain. # Check if more than one manager exists on the domain.