From 7a0574e6f35f95d4797f626165a022985f51faa6 Mon Sep 17 00:00:00 2001 From: Chris Church Date: Fri, 5 Feb 2016 04:30:08 -0500 Subject: [PATCH] Quick fix for select related error with unified job templates and jobs. Fixes #793 and #795. --- awx/main/access.py | 30 ++++++++++++++++-------------- 1 file changed, 16 insertions(+), 14 deletions(-) diff --git a/awx/main/access.py b/awx/main/access.py index e17fc59b02..0cafdb918e 100644 --- a/awx/main/access.py +++ b/awx/main/access.py @@ -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):