diff --git a/src/registrar/admin.py b/src/registrar/admin.py index 6ceee7f40..6799120e2 100644 --- a/src/registrar/admin.py +++ b/src/registrar/admin.py @@ -842,12 +842,11 @@ def has_change_permission(self, request, obj=None): # 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) diff --git a/src/registrar/views/utility/mixins.py b/src/registrar/views/utility/mixins.py index 8b1256c56..97db65505 100644 --- a/src/registrar/views/utility/mixins.py +++ b/src/registrar/views/utility/mixins.py @@ -63,11 +63,9 @@ def can_access_other_user_domains(self, pk): """ # 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 diff --git a/src/registrar/views/utility/permission_views.py b/src/registrar/views/utility/permission_views.py index 42cca770d..aeeaadc2d 100644 --- a/src/registrar/views/utility/permission_views.py +++ b/src/registrar/views/utility/permission_views.py @@ -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"