External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-06-25 08:28:03 -02:30
Code Issues Packages Projects Releases Wiki Activity

add some helpers functions in validate and some other minor fixes

Browse Source 
make black changes

increase the number of queries to 30

fix the flake failure

add functional changes for bulk job launch and some minor fixes

pull changes
This commit is contained in:
Nikhil
2023-01-22 13:19:46 +05:30
committed by Elijah DeLee
parent 02e5ba5f94
commit 861ba8a727
3 changed files with 261 additions and 106 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
awx/main/access.py
View File

@@ -1997,7 +1997,11 @@ class WorkflowJobNodeAccess(BaseAccess):
)
def filtered_queryset(self):
return self.model.objects.filter(workflow_job__unified_job_template__in=UnifiedJobTemplate.accessible_pk_qs(self.user, 'read_role'))
return self.model.objects.filter(
Q(workflow_job__unified_job_template__in=UnifiedJobTemplate.accessible_pk_qs(self.user, 'read_role'))
| Q(workflow_job__created_by_id=self.user.id, workflow_job__is_bulk_job=True)
| Q(workflow_job__organization__in=Organization.objects.filter(Q(admin_role__members=self.user)), workflow_job__is_bulk_job=True)
)
@check_superuser
def can_add(self, data):
@@ -2125,7 +2129,7 @@ class WorkflowJobAccess(BaseAccess):
def filtered_queryset(self):
return WorkflowJob.objects.filter(
Q(unified_job_template__in=UnifiedJobTemplate.accessible_pk_qs(self.user, 'read_role'))
| Q(created_by__in=str(self.user.id), is_bulk_job=True)
| Q(created_by_id=self.user.id, is_bulk_job=True)
| Q(organization__in=Organization.objects.filter(Q(admin_role__members=self.user)), is_bulk_job=True)
)