From 0fcfe6114a6f36cf75d4298ce87ddc99e2aaa444 Mon Sep 17 00:00:00 2001
From: chouseknecht <chouse@ansible.com>
Date: Fri, 16 May 2014 14:54:40 -0400
Subject: [PATCH] Increated timeout length for select a play post filter
 application. Post job launch send user to job detail page.

---
 awx/ui/static/js/controllers/JobDetail.js | 4 ++--
 awx/ui/static/js/helpers/JobSubmission.js | 4 +---
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js
index d8e6dc90c0..528b7461e5 100644
--- a/awx/ui/static/js/controllers/JobDetail.js
+++ b/awx/ui/static/js/controllers/JobDetail.js
@@ -621,7 +621,7 @@ function JobDetailController ($scope, $compile, $routeParams, ClearScope, Breadc
             scope.activePlay = scope.plays[scope.plays.length - 1].id;
             setTimeout(function() {
                 SelectPlay({ scope: scope, id: scope.activePlay });
-            }, 500);
+            }, 2000);
         }
         scope.searchSummaryHosts();
     };
@@ -651,7 +651,7 @@ function JobDetailController ($scope, $compile, $routeParams, ClearScope, Breadc
         scope.searchSummaryHosts();
         setTimeout(function() {
             SelectPlay({ scope: scope, id: scope.activePlay });
-        }, 500);
+        }, 2000);
     };
 }
 
diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index 24620dc4f4..d2221dcc61 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -439,9 +439,7 @@ function($location, Wait, GetBasePath, LookUpInit, JobTemplateForm, CredentialLi
             }
             scope.removePlaybookLaunchFinished = scope.$on('PlaybookLaunchFinished', function() {
                 var base = $location.path().replace(/^\//, '').split('/')[0];
-                if (base !== 'jobs') {
-                    $location.path('/jobs');
-                }
+                $location.path('/jobs/' + new_job_id);
             });
 
             if (scope.removeStartPlaybookRun) {