Merge pull request #3687 from AlanCoding/wf_fixes

Workflow serializer fixes
This commit is contained in:
Alan Rominger
2016-10-11 08:39:01 -04:00
committed by GitHub
2 changed files with 8 additions and 2 deletions

View File

@@ -1277,6 +1277,7 @@ class WorkflowJobTemplateNodeAccess(BaseAccess):
qs = self.model.objects.filter(
workflow_job_template__in=WorkflowJobTemplate.accessible_objects(
self.user, 'read_role'))
qs = qs.prefetch_related('success_nodes', 'failure_nodes', 'always_nodes')
return qs
def can_use_prompted_resources(self, data):
@@ -1371,6 +1372,8 @@ class WorkflowJobNodeAccess(BaseAccess):
qs = self.model.objects.filter(
workflow_job__workflow_job_template__in=WorkflowJobTemplate.accessible_objects(
self.user, 'read_role'))
qs = qs.select_related('unified_job_template', 'job')
qs = qs.prefetch_related('success_nodes', 'failure_nodes', 'always_nodes')
return qs
def can_add(self, data):