External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-08-01 10:29:56 -02:30
Code Issues Packages Projects Releases Wiki Activity

Enable deletion of orphaned approval nodes

Browse Source 
Update serializer to include workflow approval for activity stream
This commit is contained in:
beeankha
2019-07-25 15:03:26 -04:00
committed by Ryan Petrello
parent 64c94d478d
commit 3357c96774
7 changed files with 61 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/main/access.py
View File

@@ -2631,6 +2631,7 @@ class ActivityStreamAccess(BaseAccess):
app_set = OAuth2ApplicationAccess(self.user).filtered_queryset()
token_set = OAuth2TokenAccess(self.user).filtered_queryset()
# &&&&&& Activity Stream + RBAC here??
return qs.filter(
Q(ad_hoc_command__inventory__in=inventory_set) |
Q(o_auth2_application__in=app_set) |
@@ -2796,11 +2797,11 @@ class WorkflowApprovalAccess(BaseAccess):
self.user, 'read_role'))
def get_queryset(self):
return super(UnifiedJobTemplateAccess, self).get_queryset().exclude(
workflowapprovaltemplate__isnull=False)
return super(WorkflowApprovalAccess, self).get_queryset().exclude(
workflow_approval_template__isnull=False)
def can_approve_or_deny(self, obj):
if self.user.approval_role:
if self.user.approval_role or self.user.system_administrator:
return True
@@ -2828,8 +2829,8 @@ class WorkflowApprovalTemplateAccess(BaseAccess):
self.user, 'read_role'))
def get_queryset(self):
return super(UnifiedJobAccess, self).get_queryset().exclude(
workflowapproval__isnull=False)
return super(WorkflowApprovalTemplateAccess, self).get_queryset().filter(
approvals__isnull=False)
for cls in BaseAccess.__subclasses__():