From b89edcac1634ab314034db9b190eaa59b014186e Mon Sep 17 00:00:00 2001
From: jaredevantabor <jtabor@ansible.com>
Date: Tue, 14 Feb 2017 20:58:07 -0500
Subject: [PATCH] relaunching on jobs page should always keep user on jobs
 page, for all job types

---
 .../launchjob.factory.js                        | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 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 f0063054fb..c7bc2d499f 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
@@ -128,17 +128,14 @@ export default
                                 $state.go(state, {id: job}, {reload:true});
                             };
 
-                            if(_.has(data, 'job')) {
-                                if(base === 'jobs'){
-                                    if(scope.clearDialog) {
-                                        scope.clearDialog();
-                                    }
-                                    return;
+                            if(base === 'jobs'){
+                                if(scope.clearDialog) {
+                                    scope.clearDialog();
                                 }
-                                else{
-                                    goToJobDetails('jobDetail');
-                                }
-
+                                return;
+                            }
+                            else if(_.has(data, 'job')) {
+                                goToJobDetails('jobDetail');
                             }
                             else if(data.type && data.type === 'workflow_job') {
                                 job = data.id;