From 44fdddd34518da8f9a8476284d67fb0a17380563 Mon Sep 17 00:00:00 2001 From: Chris Houseknecht Date: Tue, 1 Jul 2014 14:29:45 -0400 Subject: [PATCH] Job detail page Improved unreachable host count in tasks status bar. Once a host is unreachable it shows as missing in subsequent tasks, which is the expected result as it is skipped but not really marked as skipped. --- awx/ui/static/js/controllers/JobDetail.js | 7 ++++--- awx/ui/static/js/helpers/JobDetail.js | 4 ++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/awx/ui/static/js/controllers/JobDetail.js b/awx/ui/static/js/controllers/JobDetail.js index 1bf027c587..debc4b1517 100644 --- a/awx/ui/static/js/controllers/JobDetail.js +++ b/awx/ui/static/js/controllers/JobDetail.js @@ -200,7 +200,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, status_text = "Failed"; break; case "unreachable": - status = "failed"; status_text = "Unreachable"; break; case "skipped": @@ -303,6 +302,10 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, taskActiveClass: '', hostResults: {} }; + if (play.firstTask !== event.id) { + // this is not the first task + play.tasks[event.id].hostCount = play.tasks[play.firstTask].hostCount; + } SetTaskStyles({ task: play.tasks[event.id] }); @@ -731,7 +734,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, status_text = "Failed"; break; case "unreachable": - status = "failed"; status_text = "Unreachable"; break; case "skipped": @@ -803,7 +805,6 @@ function JobDetailController ($rootScope, $scope, $compile, $routeParams, $log, status_text = "Failed"; break; case "unreachable": - status = "failed"; status_text = "Unreachable"; break; case "skipped": diff --git a/awx/ui/static/js/helpers/JobDetail.js b/awx/ui/static/js/helpers/JobDetail.js index 6f37d4db53..ee709a559b 100644 --- a/awx/ui/static/js/helpers/JobDetail.js +++ b/awx/ui/static/js/helpers/JobDetail.js @@ -230,10 +230,12 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge failedCount: 0, changedCount: 0, skippedCount: 0, + unreachableCount: 0, successfulStyle: { display: 'none'}, failedStyle: { display: 'none' }, changedStyle: { display: 'none' }, skippedStyle: { display: 'none' }, + unreachableStyle: { display: 'none' }, hostResults: {} }; @@ -466,7 +468,6 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge break; case "unreachable": status_text = "Unreachable"; - status = "failed"; break; case "skipped": status_text = "Skipped"; @@ -772,7 +773,6 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge status_text = "Failed"; break; case "unreachable": - status = "failed"; status_text = "Unreachable"; break; case "skipped":