zydronium/manage.get.gov
1
0
Fork 0
mirror of https://github.com/cisagov/manage.get.gov.git synced 2025-07-30 14:36:32 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'main' into za/1848-copy-contact-email-to-clipboard

Browse source
This commit is contained in:
zandercymatics 2024-04-02 13:30:53 -06:00
commit d037376d41
No known key found for this signature in database
GPG key ID: FF4636ABEC9682B7
6 changed files with 73 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

40
src/registrar/admin.py
View file

@ -900,13 +900,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",
]
],
},
),
(
@ -915,12 +923,20 @@ class DomainInformationAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
]
],
},
),
]
@ -1112,13 +1128,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",
]
],
},
),
(
@ -1127,12 +1151,20 @@ class DomainRequestAdmin(ListHeaderAdmin):
"fields": [
"organization_name",
"state_territory",
]
},
),
(
"More details",
{
"classes": ["collapse"],
"fields": [
"address_line1",
"address_line2",
"city",
"zipcode",
"urbanization",
]
],
},
),
]

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

@ -424,6 +424,21 @@ address.dja-address-contact-list {
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);
}
}
// Make the clipboard button "float" inside of the input box
.admin-icon-group {
position: relative;

12
src/registrar/fixtures_users.py
View file

@ -93,6 +93,12 @@ class UserFixture:
"last_name": "Chin",
"email": "szu.chin@associates.cisa.dhs.gov",
},
{
"username": "012f844d-8a0f-4225-9d82-cbf87bff1d3e",
"first_name": "Riley",
"last_name": "Orr",
"email": "riley+320@truss.works",
},
]
STAFF = [
@ -169,6 +175,12 @@ class UserFixture:
"last_name": "Mcelya-Analyst",
"email": "ALEXANDER.MCELYA@cisa.dhs.gov",
},
{
"username": "082a066f-e0a4-45f6-8672-4343a1208a36",
"first_name": "Riley-Analyst",
"last_name": "Orr-Analyst",
"email": "riley+321@truss.works",
},
]
def load_users(cls, users, group_name):

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

@ -41,8 +41,7 @@
</div>
</div>
<br>
<p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br>
<b class="review__step__name">Request #:</b> {{DomainRequest.id}}</p>
<p> <b class="review__step__name">Last updated:</b> {{DomainRequest.updated_at|date:"F j, Y"}}<br></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">
Withdraw request</a>

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

@ -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.