zware/awx
1
0
Fork 0
mirror of https://github.com/ZwareBear/awx.git synced 2026-04-27 02:11:48 -05:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'devel' of github.com:ansible/ansible-tower into rbac-devel-integration

Browse Source
This commit is contained in:
Akita Noek
2016-02-09 09:47:29 -05:00
parent ca67772d9f cd6f42ee68
commit 29f8d6b778
12 changed files with 259 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
awx/main/access.py
View File

@@ -1379,14 +1379,15 @@ class UnifiedJobTemplateAccess(BaseAccess):
qs = qs.select_related(
'created_by',
'modified_by',
'project',
'inventory',
'credential',
'cloud_credential',
#'project',
#'inventory',
#'credential',
#'cloud_credential',
'next_schedule',
'last_job',
'current_job',
)
# FIXME: Figure out how to do select/prefetch on related project/inventory/credential/cloud_credential.
return qs
class UnifiedJobAccess(BaseAccess):
@@ -1412,18 +1413,19 @@ class UnifiedJobAccess(BaseAccess):
qs = qs.select_related(
'created_by',
'modified_by',
'project',
'inventory',
'credential',
'project___credential',
'inventory_source___credential',
'inventory_source___inventory',
'job_template___inventory',
'job_template___project',
'job_template___credential',
'job_template___cloud_credential',
#'project',
#'inventory',
#'credential',
#'project___credential',
#'inventory_source___credential',
#'inventory_source___inventory',
#'job_template___inventory',
#'job_template___project',
#'job_template___credential',
#'job_template___cloud_credential',
)
qs = qs.prefetch_related('unified_job_template')
# FIXME: Figure out how to do select/prefetch on related project/inventory/credential/cloud_credential.
return qs
class ScheduleAccess(BaseAccess):