External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #381 from jaredevantabor/job-detail

Browse Source 
Job detail page: fix issue with 'missing' host count
This commit is contained in:
jaredevantabor 2015-08-17 21:11:04 -07:00
commit ddfeaf597d
2 changed files with 16 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/client/src/controllers/JobDetail.js
View File

@ -298,7 +298,7 @@ export function JobDetailController ($location, $rootScope, $filter, $scope, $co
else {
name = "<deleted host>";
}
scope.jobData.hostSummaries[name] = {
scope.jobData.hostSummaries[event.host] = {
id: event.host,
name: name,
ok: event.ok,

25
awx/ui/client/src/helpers/JobDetail.js
View File

@ -3,7 +3,7 @@
*
* All Rights Reserved
*************************************************/
/**
* @ngdoc function
* @name helpers.function:JobDetail
@ -497,18 +497,18 @@ export default
scope.host_summary.failed;
*/
if (scope.jobData.hostSummaries[name] !== undefined) {
scope.jobData.hostSummaries[name].ok += (status === 'successful') ? 1 : 0;
scope.jobData.hostSummaries[name].changed += (status === 'changed') ? 1 : 0;
scope.jobData.hostSummaries[name].unreachable += (status === 'unreachable') ? 1 : 0;
scope.jobData.hostSummaries[name].failed += (status === 'failed') ? 1 : 0;
if (scope.jobData.hostSummaries[host_id] !== undefined) {
scope.jobData.hostSummaries[host_id].ok += (status === 'successful') ? 1 : 0;
scope.jobData.hostSummaries[host_id].changed += (status === 'changed') ? 1 : 0;
scope.jobData.hostSummaries[host_id].unreachable += (status === 'unreachable') ? 1 : 0;
scope.jobData.hostSummaries[host_id].failed += (status === 'failed') ? 1 : 0;
if (status === 'failed' || status === 'unreachable') {
scope.jobData.hostSummaries[name].status = 'failed';
scope.jobData.hostSummaries[host_id].status = 'failed';
}
}
else {
scope.jobData.hostSummaries[name] = {
id: name,
scope.jobData.hostSummaries[host_id] = {
id: host_id,
name: name,
ok: (status === 'successful') ? 1 : 0,
changed: (status === 'changed') ? 1 : 0,
@ -658,7 +658,12 @@ export default
var task = params.task,
diff;
task.missingCount = task.hostCount - (task.failedCount + task.changedCount + task.skippedCount + task.successfulCount + task.unreachableCount);
task.missingCount = task.hostCount - (task.failedCount + task.changedCount + task.skippedCount + task.successfulCount +
task.unreachableCount);
if(task.missingCount<0){
task.hostCount = (task.failedCount + task.changedCount + task.skippedCount + task.successfulCount +
task.unreachableCount);
}
task.missingPct = (task.hostCount > 0) ? Math.ceil((100 * (task.missingCount / task.hostCount))) : 0;
task.failedPct = (task.hostCount > 0) ? Math.ceil((100 * (task.failedCount / task.hostCount))) : 0;
task.changedPct = (task.hostCount > 0) ? Math.ceil((100 * (task.changedCount / task.hostCount))) : 0;