From c628e9de0a79a7cc15e1bba874b3366fed73e01a Mon Sep 17 00:00:00 2001 From: Wayne Witzel III Date: Fri, 16 Mar 2018 09:32:42 -0400 Subject: [PATCH] Filter active jobs by WFT/JT --- awx/main/models/jobs.py | 2 +- awx/main/models/workflow.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/awx/main/models/jobs.py b/awx/main/models/jobs.py index 6bae4b6a78..f1f7f9e28d 100644 --- a/awx/main/models/jobs.py +++ b/awx/main/models/jobs.py @@ -456,7 +456,7 @@ class JobTemplate(UnifiedJobTemplate, JobOptions, SurveyJobTemplateMixin, Resour RelatedJobsMixin ''' def _get_active_jobs(self): - return Job.objects.filter(status__in=ACTIVE_STATES) + return Job.objects.filter(status__in=ACTIVE_STATES, job_template=self) class Job(UnifiedJob, JobOptions, SurveyJobMixin, JobNotificationMixin, TaskManagerJobMixin): diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 73a56a2dea..59f3bccb74 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -415,7 +415,7 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl RelatedJobsMixin ''' def _get_active_jobs(self): - return WorkflowJob.objects.filter(status__in=ACTIVE_STATES) + return WorkflowJob.objects.filter(status__in=ACTIVE_STATES, workflow_job_template=self) class WorkflowJob(UnifiedJob, WorkflowJobOptions, SurveyJobMixin, JobNotificationMixin):