From 5421cd0f0d6e9d7ce6fd4ebab9f174419aa4c6ba Mon Sep 17 00:00:00 2001
From: Michael Abashian <mabashian@ansible.com>
Date: Sun, 2 Jul 2017 14:40:42 -0400
Subject: [PATCH] Remain on jobs list when relaunching jobs

---
 .../launchjob.factory.js                      | 62 +++++++++----------
 1 file changed, 30 insertions(+), 32 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 b05c6015f9..8fee9bd228 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
@@ -146,42 +146,40 @@ export default
                                 $state.go(state, {id: job}, {reload:true});
                             };
 
-                            if(_.has(data, 'job')) {
-                                goTojobResults('jobResult');
-                            } else if(base === 'jobs'){
-                                if(scope.clearDialog) {
-                                    scope.clearDialog();
-                                }
+                            if($state.includes('jobs')) {
                                 return;
-                            } else if(data.type && data.type === 'workflow_job') {
-                                job = data.id;
-                                goTojobResults('workflowResults');
                             }
-                            else if(_.has(data, 'ad_hoc_command')) {
-                                goTojobResults('adHocJobStdout');
-                            }
-                            else if(_.has(data, 'system_job')) {
-                                goTojobResults('managementJobStdout');
-                            }
-                            else if(_.has(data, 'project_update')) {
-                                // If we are on the projects list or any child state of that list
-                                // then we want to stay on that page.  Otherwise go to the stdout
-                                // view.
-                                if(!$state.includes('projects')) {
-                                    goTojobResults('scmUpdateStdout');
+
+                            else {
+                                if(_.has(data, 'job')) {
+                                    goTojobResults('jobResult');
+                                } else if(data.type && data.type === 'workflow_job') {
+                                    job = data.id;
+                                    goTojobResults('workflowResults');
+                                }
+                                else if(_.has(data, 'ad_hoc_command')) {
+                                    goTojobResults('adHocJobStdout');
+                                }
+                                else if(_.has(data, 'system_job')) {
+                                    goTojobResults('managementJobStdout');
+                                }
+                                else if(_.has(data, 'project_update')) {
+                                    // If we are on the projects list or any child state of that list
+                                    // then we want to stay on that page.  Otherwise go to the stdout
+                                    // view.
+                                    if(!$state.includes('projects')) {
+                                        goTojobResults('scmUpdateStdout');
+                                    }
+                                }
+                                else if(_.has(data, 'inventory_update')) {
+                                    // If we are on the inventory manage page or any child state of that
+                                    // page then we want to stay on that page.  Otherwise go to the stdout
+                                    // view.
+                                    if(!$state.includes('inventories.edit')) {
+                                        goTojobResults('inventorySyncStdout');
+                                    }
                                 }
                             }
-                            else if(_.has(data, 'inventory_update')) {
-                                // If we are on the inventory manage page or any child state of that
-                                // page then we want to stay on that page.  Otherwise go to the stdout
-                                // view.
-                                if(!$state.includes('inventories.edit')) {
-                                    goTojobResults('inventorySyncStdout');
-                                }
-                            }
-                        }
-                        if(scope.clearDialog) {
-                            scope.clearDialog();
                         }
                     })
                     .error(function(data, status) {