From 0e6305c9ec4024eb51575662cb32ca717564c83f Mon Sep 17 00:00:00 2001
From: Chris Houseknecht <chouseknecht@me.com>
Date: Tue, 28 Jan 2014 17:22:34 -0500
Subject: [PATCH] AC-987 job launch shows working 2x

---
 awx/ui/static/js/controllers/Inventories.js | 2 +-
 awx/ui/static/js/helpers/JobSubmission.js   | 7 +------
 2 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/awx/ui/static/js/controllers/Inventories.js b/awx/ui/static/js/controllers/Inventories.js
index 773f340263..7960a6257d 100644
--- a/awx/ui/static/js/controllers/Inventories.js
+++ b/awx/ui/static/js/controllers/Inventories.js
@@ -94,7 +94,7 @@ function InventoriesList ($scope, $rootScope, $location, $log, $routeParams, Res
                else {
                   // many hosts with 0 failures
                   scope.inventories[i].failed_hosts_tip = scope.inventories[i].total_hosts + 
-                      ( (scope.inventories[i].total_hosts > 1) ? ' hosts' : ' host' ) + " with no failures. Click to view details.";
+                      ( (scope.inventories[i].total_hosts > 1) ? ' hosts' : ' host' ) + " with no job failures. Click to view details.";
                   scope.inventories[i].failed_hosts_link = '/#/inventories/' + scope.inventories[i].id + '/';
                   scope.inventories[i].failed_hosts_class = 'false';
                }
diff --git a/awx/ui/static/js/helpers/JobSubmission.js b/awx/ui/static/js/helpers/JobSubmission.js
index 5a6e040f70..de4495d28d 100644
--- a/awx/ui/static/js/helpers/JobSubmission.js
+++ b/awx/ui/static/js/helpers/JobSubmission.js
@@ -230,7 +230,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                 extra_vars: data.extra_vars
                 })
                 .success( function(data, status, headers, config) {
-                    Wait('stop');
                     scope.job_id = data.id;
                     if (data.passwords_needed_to_start.length > 0) {
                        // Passwords needed. Prompt for passwords, then start job.
@@ -243,7 +242,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                     }
                     else {
                        // No passwords needed, start the job!
-                       Wait('start');
                        Rest.setUrl(data.related.start); 
                        Rest.post()
                            .success( function(data, status, headers, config) {
@@ -257,7 +255,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                                }
                                })
                            .error( function(data, status, headers, config) { 
-                               Wait('stop');
                                ProcessErrors(scope, data, status, null,
                                    { hdr: 'Error!', msg: 'Failed to start job. POST returned status: ' + status });
                                });
@@ -275,11 +272,11 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
         Rest.setUrl(url);
         Rest.get()
             .success( function(data, status, headers, config) {
-                Wait('stop');
                 // Create a job record
                 scope.credential = '';
                 if (data.credential == '' || data.credential == null) {
                    // Template does not have credential, prompt for one
+                   Wait('stop');
                    if (scope.credentialWatchRemove) {
                       scope.credentialWatchRemove();
                    }
@@ -309,7 +306,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                 }
             })
             .error( function(data, status, headers, config) {
-                Wait('stop');
                 ProcessErrors(scope, data, status, null,
                     { hdr: 'Error!', msg: 'Failed to get job template details. GET returned status: ' + status });
             });
@@ -394,7 +390,6 @@ angular.module('JobSubmissionHelper', [ 'RestServices', 'Utilities', 'Credential
                 }   
             })
             .error( function(data, status, headers, config) {
-                Wait('stop');
                 ProcessErrors(scope, data, status, null,
                     { hdr: 'Error!', msg: 'Failed to get project update details: ' +  url + ' GET status: ' + status });
             });