From 83a6b8ba539509f4c03da6d512a5f470b2778558 Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Wed, 11 Jan 2017 20:43:43 -0500
Subject: [PATCH] Fixed bug where relaunching a workflow job from the details
 view was throwing a 404.  Also fixed bug where relaunching a workflow from
 the details view was not redirecting the user to the new details view.

---
 .../job-submission-factories/launchjob.factory.js            | 5 +++--
 .../client/src/workflow-results/workflow-results.service.js  | 2 +-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
index 3c9dbb1c60..64c9344b19 100644
--- a/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
+++ b/awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js
@@ -120,7 +120,7 @@ export default
                     Rest.post(job_launch_data)
                     .success(function(data) {
                         Wait('stop');
-                        var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command || data.workflow_job;
+                        var job = data.job || data.system_job || data.project_update || data.inventory_update || data.ad_hoc_command;
                         if($rootScope.portalMode===false && Empty(data.system_job) || (base === 'home')){
                             // use $state.go with reload: true option to re-instantiate sockets in
 
@@ -131,7 +131,8 @@ export default
                             if(_.has(data, 'job')) {
                                 goToJobDetails('jobDetail');
                             }
-                            else if(_.has(data, 'workflow_job')) {
+                            else if(data.type && data.type === 'workflow_job') {
+                                job = data.id;
                                 goToJobDetails('workflowResults');
                             }
                             else if(_.has(data, 'ad_hoc_command')) {
diff --git a/awx/ui/client/src/workflow-results/workflow-results.service.js b/awx/ui/client/src/workflow-results/workflow-results.service.js
index 2d3fddf2f4..601c845eaa 100644
--- a/awx/ui/client/src/workflow-results/workflow-results.service.js
+++ b/awx/ui/client/src/workflow-results/workflow-results.service.js
@@ -126,7 +126,7 @@ export default ['$q', 'Prompt', '$filter', 'Wait', 'Rest', '$state', 'ProcessErr
         },
         relaunchJob: function(scope) {
             InitiatePlaybookRun({ scope: scope, id: scope.workflow.id,
-                relaunch: true, job_type: 'workflow_job_template' });
+                relaunch: true, job_type: 'workflow_job' });
         }
     };
     return val;