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

revert back tests from is_staff to has_perm

Browse source
This commit is contained in:
Rachid Mrad 2023-09-29 21:33:48 -04:00
parent 0c05518d61
commit 3580e070a3
No known key found for this signature in database
GPG key ID: EF38E4CEC4A8F3CF
3 changed files with 11 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

11
src/registrar/admin.py
View file

@ -842,12 +842,11 @@ class DomainAdmin(ListHeaderAdmin):
# Fixes a bug wherein users which are only is_staff
# can access 'change' when GET,
# but cannot access this page when it is a request of type POST.
# if request.user.has_perm(
# "registrar.full_access_permission"
# ) or request.user.has_perm(
# "registrar.analyst_access_permission"
# ):
if request.user.is_staff:
if request.user.has_perm(
"registrar.full_access_permission"
) or request.user.has_perm(
"registrar.analyst_access_permission"
):
return True
return super().has_change_permission(request, obj)

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

@ -63,11 +63,9 @@ class DomainPermission(PermissionsLoginMixin):
"""
# Check if the user is permissioned...
# user_is_analyst_or_superuser = self.request.user.has_perm(
# "registrar.analyst_access_permission"
# ) or self.request.user.has_perm("registrar.full_access_permission")
user_is_analyst_or_superuser = self.request.user.is_staff
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 user_is_analyst_or_superuser:
return False

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

@ -33,10 +33,9 @@ class DomainPermissionView(DomainPermission, DetailView, abc.ABC):
def get_context_data(self, **kwargs):
context = super().get_context_data(**kwargs)
user = self.request.user
# context["is_analyst_or_superuser"] = user.has_perm(
# "registrar.analyst_access_permission"
# ) or user.has_perm("registrar.full_access_permission")
context["is_analyst_or_superuser"] = user.is_staff
context["is_analyst_or_superuser"] = user.has_perm(
"registrar.analyst_access_permission"
) or user.has_perm("registrar.full_access_permission")
# Stored in a variable for the linter
action = "analyst_action"
action_location = "analyst_action_location"