From f419fb9bed9cf71fa663cffdbb39c61646e7b575 Mon Sep 17 00:00:00 2001 From: AlanCoding Date: Thu, 19 Jan 2017 08:51:08 -0500 Subject: [PATCH] move node copy into create_unified_job, copy nodes on schedule --- awx/api/views.py | 2 +- awx/main/models/workflow.py | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/awx/api/views.py b/awx/api/views.py index 965078727a..3ea3c69692 100644 --- a/awx/api/views.py +++ b/awx/api/views.py @@ -2969,7 +2969,7 @@ class WorkflowJobTemplateLaunch(WorkflowsEnforcementMixin, RetrieveAPIView): prompted_fields, ignored_fields = obj._accept_or_ignore_job_kwargs(**request.data) - new_job = obj.create_workflow_job(**prompted_fields) + new_job = obj.create_unified_job(**prompted_fields) new_job.signal_start(**prompted_fields) data = OrderedDict() diff --git a/awx/main/models/workflow.py b/awx/main/models/workflow.py index 11d4c37601..b98d9c1211 100644 --- a/awx/main/models/workflow.py +++ b/awx/main/models/workflow.py @@ -392,8 +392,8 @@ class WorkflowJobTemplate(UnifiedJobTemplate, WorkflowJobOptions, SurveyJobTempl success=list(success_notification_templates), any=list(any_notification_templates)) - def create_workflow_job(self, **kwargs): - workflow_job = self.create_unified_job(**kwargs) + def create_unified_job(self, **kwargs): + workflow_job = super(WorkflowJobTemplate, self).create_unified_job(**kwargs) workflow_job.copy_nodes_from_original(original=self) return workflow_job