mirror of
https://github.com/ansible/awx.git
synced 2026-03-26 21:35:01 -02:30
Add more RBAC, filter out AJT/AJs from unified jobs lists
Comment out placeholder in serializer
This commit is contained in:
@@ -2795,11 +2795,13 @@ class WorkflowApprovalAccess(BaseAccess):
|
||||
unified_job_node__in=WorkflowJobNode.accessible_pk_qs(
|
||||
self.user, 'read_role'))
|
||||
|
||||
# &&&&&&
|
||||
# def can_approve_or_deny(self, obj):
|
||||
# if self.user.is_superuser: or "self.user.approval_role"?
|
||||
# return True
|
||||
# return self.can_change(obj, ????)
|
||||
def get_queryset(self):
|
||||
return super(UnifiedJobTemplateAccess, self).get_queryset().exclude(
|
||||
workflowapprovaltemplate__isnull=False)
|
||||
|
||||
def can_approve_or_deny(self, obj):
|
||||
if self.user.approval_role:
|
||||
return True
|
||||
|
||||
|
||||
class WorkflowApprovalTemplateAccess(BaseAccess):
|
||||
@@ -2825,6 +2827,10 @@ class WorkflowApprovalTemplateAccess(BaseAccess):
|
||||
workflowjobtemplatenodes__workflow_job_template__in=WorkflowJobTemplate.accessible_pk_qs(
|
||||
self.user, 'read_role'))
|
||||
|
||||
def get_queryset(self):
|
||||
return super(UnifiedJobAccess, self).get_queryset().exclude(
|
||||
workflowapproval__isnull=False)
|
||||
|
||||
|
||||
for cls in BaseAccess.__subclasses__():
|
||||
access_registry[cls.model] = cls
|
||||
|
||||
Reference in New Issue
Block a user