removed unnecessary permission

This commit is contained in:
David Kennedy 2025-03-18 09:02:14 -04:00
parent 5528390ee9
commit 531d8c7e94
No known key found for this signature in database
GPG key ID: 6528A5386E66B96B
6 changed files with 8 additions and 35 deletions

View file

@ -4361,7 +4361,7 @@ class DomainAdmin(ListHeaderAdmin, ImportExportRegistrarModelAdmin):
if ( if (
request.user.has_perm("registrar.full_access_permission") request.user.has_perm("registrar.full_access_permission")
or request.user.has_perm("registrar.analyst_access_permission") or request.user.has_perm("registrar.analyst_access_permission")
or request.user.has_perm("registrar.omb_analyst_access_permission") or request.user.groups.filter(name="omb_analysts_group").exists()
): ):
return True return True
return super().has_change_permission(request, obj) return super().has_change_permission(request, obj)

View file

@ -465,23 +465,25 @@ class CustomizableEmailBase {
} }
initializeModalConfirm() { initializeModalConfirm() {
// When the modal confirm button is present, add a listener
if (this.modalConfirm) { if (this.modalConfirm) {
this.modalConfirm.addEventListener("click", () => { this.modalConfirm.addEventListener("click", () => {
this.textarea.removeAttribute('readonly'); this.textarea.removeAttribute('readonly');
this.textarea.focus(); this.textarea.focus();
hideElement(this.directEditButton); hideElement(this.directEditButton);
hideElement(this.modalTrigger); hideElement(this.modalTrigger);
}); });
} }
} }
initializeDirectEditButton() { initializeDirectEditButton() {
// When the direct edit button is present, add a listener
if (this.directEditButton) { if (this.directEditButton) {
this.directEditButton.addEventListener("click", () => { this.directEditButton.addEventListener("click", () => {
this.textarea.removeAttribute('readonly'); this.textarea.removeAttribute('readonly');
this.textarea.focus(); this.textarea.focus();
hideElement(this.directEditButton); hideElement(this.directEditButton);
hideElement(this.modalTrigger); hideElement(this.modalTrigger);
}); });
} }
} }

View file

@ -112,7 +112,7 @@ def _user_has_permission(user, request, rules, **kwargs):
permission_checks = [ permission_checks = [
(IS_STAFF, lambda: user.is_staff), (IS_STAFF, lambda: user.is_staff),
(IS_CISA_ANALYST, lambda: user.has_perm("registrar.analyst_access_permission")), (IS_CISA_ANALYST, lambda: user.has_perm("registrar.analyst_access_permission")),
(IS_OMB_ANALYST, lambda: user.has_perm("registrar.omb_analyst_access_permission")), (IS_OMB_ANALYST, lambda: user.groups.filter(name="omb_analysts_group").exists()),
(IS_FULL_ACCESS, lambda: user.has_perm("registrar.full_access_permission")), (IS_FULL_ACCESS, lambda: user.has_perm("registrar.full_access_permission")),
( (
IS_DOMAIN_MANAGER, IS_DOMAIN_MANAGER,

View file

@ -1,23 +0,0 @@
# Generated by Django 4.2.17 on 2025-03-06 20:00
from django.db import migrations
class Migration(migrations.Migration):
dependencies = [
("registrar", "0143_create_groups_v18"),
]
operations = [
migrations.AlterModelOptions(
name="user",
options={
"permissions": [
("analyst_access_permission", "Analyst Access Permission"),
("omb_analyst_access_permission", "OMB Analyst Access Permission"),
("full_access_permission", "Full Access Permission"),
]
},
),
]

View file

@ -40,7 +40,6 @@ class User(AbstractUser):
permissions = [ permissions = [
("analyst_access_permission", "Analyst Access Permission"), ("analyst_access_permission", "Analyst Access Permission"),
("omb_analyst_access_permission", "OMB Analyst Access Permission"),
("full_access_permission", "Full Access Permission"), ("full_access_permission", "Full Access Permission"),
] ]

View file

@ -158,11 +158,6 @@ class UserGroup(Group):
"model": "domain", "model": "domain",
"permissions": ["view_domain"], "permissions": ["view_domain"],
}, },
{
"app_label": "registrar",
"model": "user",
"permissions": ["omb_analyst_access_permission"],
},
{ {
"app_label": "registrar", "app_label": "registrar",
"model": "domaininvitation", "model": "domaininvitation",