From 128f619e14f33ccb71dad619f93b9a9633b7e281 Mon Sep 17 00:00:00 2001 From: Rachid Mrad Date: Fri, 29 Sep 2023 18:25:47 -0400 Subject: [PATCH] revert permissions tests in views and admin for is_staff --- src/registrar/admin.py | 11 ++++++----- src/registrar/views/utility/mixins.py | 8 +++++--- src/registrar/views/utility/permission_views.py | 7 ++++--- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 88f24f9d6..77565c1f4 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -837,11 +837,12 @@ 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" - ) or request.user.is_staff: + # if request.user.has_perm( + # "registrar.full_access_permission" + # ) or request.user.has_perm( + # "registrar.analyst_access_permission" + # ): + if request.user.is_staff: return True return super().has_change_permission(request, obj) diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py index 97db65505..e14537350 100644 --- a/src/registrar/views/utility/mixins.py +++ b/src/registrar/views/utility/mixins.py @@ -63,9 +63,11 @@ 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.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 if not user_is_analyst_or_superuser: return False diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py index aeeaadc2d..42cca770d 100644 --- a/src/registrar/views/utility/permission_views.py +++ b/src/registrar/views/utility/permission_views.py @@ -33,9 +33,10 @@ 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.has_perm( + # "registrar.analyst_access_permission" + # ) or user.has_perm("registrar.full_access_permission") + context["is_analyst_or_superuser"] = user.is_staff # Stored in a variable for the linter action = "analyst_action" action_location = "analyst_action_location"