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

Merge pull request #799 from cchurch/quick-fix-select-related

Browse Source 
Quick fix for select related error with unified job templates and jobs
This commit is contained in:
Matthew Jones
2016-02-05 09:54:37 -05:00
parent 71cd77c3e0 7a0574e6f3
commit e890f23d00
1 changed files with 16 additions and 14 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( qs = qs.select_related(
'created_by', 'created_by',
'modified_by', 'modified_by',
'project', #'project',
'inventory', #'inventory',
'credential', #'credential',
'cloud_credential', #'cloud_credential',
'next_schedule', 'next_schedule',
'last_job', 'last_job',
'current_job', 'current_job',
) )
# FIXME: Figure out how to do select/prefetch on related project/inventory/credential/cloud_credential.
return qs return qs
class UnifiedJobAccess(BaseAccess): class UnifiedJobAccess(BaseAccess):
@@ -1412,18 +1413,19 @@ class UnifiedJobAccess(BaseAccess):
qs = qs.select_related( qs = qs.select_related(
'created_by', 'created_by',
'modified_by', 'modified_by',
'project', #'project',
'inventory', #'inventory',
'credential', #'credential',
'project___credential', #'project___credential',
'inventory_source___credential', #'inventory_source___credential',
'inventory_source___inventory', #'inventory_source___inventory',
'job_template___inventory', #'job_template___inventory',
'job_template___project', #'job_template___project',
'job_template___credential', #'job_template___credential',
'job_template___cloud_credential', #'job_template___cloud_credential',
) )
qs = qs.prefetch_related('unified_job_template') qs = qs.prefetch_related('unified_job_template')
# FIXME: Figure out how to do select/prefetch on related project/inventory/credential/cloud_credential.
return qs return qs
class ScheduleAccess(BaseAccess): class ScheduleAccess(BaseAccess):