Merge pull request #6856 from mabashian/4987-relaunch-redirect

Remain on jobs list when relaunching jobs

awx/ui/client/src/job-submission/job-submission-factories/launchjob.factory.js

@@ -146,13 +146,13 @@ export default
                                 $state.go(state, {id: job}, {reload:true});
                             };
 
+                            if($state.includes('jobs')) {
+                                return;
+                            }
+
+                            else {
                                 if(_.has(data, 'job')) {
                                     goTojobResults('jobResult');
-                            } else if(base === 'jobs'){
-                                if(scope.clearDialog) {
-                                    scope.clearDialog();
-                                }
-                                return;
                                 } else if(data.type && data.type === 'workflow_job') {
                                     job = data.id;
                                     goTojobResults('workflowResults');
@@ -180,8 +180,6 @@ export default
                                     }
                                 }
                             }
-                        if(scope.clearDialog) {
-                            scope.clearDialog();
                         }
                     })
                     .error(function(data, status) {