External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-05-20 15:27:47 -02:30
Code Issues Packages Projects Releases Wiki Activity

Added inventory count back into the 'job status' widget on home page. Inventory, groups and hosts counts are there, but links don't quite work yet.

Browse Source
This commit is contained in:
Chris Houseknecht
2013-11-11 00:30:15 +00:00
parent 9ad30dc43c
commit 38cb40d38b
1 changed files with 17 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
awx/ui/static/js/widgets/JobStatus.js
View File

@@ -15,7 +15,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
var scope = $rootScope.$new(); var scope = $rootScope.$new();
var jobCount, jobFails, inventoryCount, inventoryFails, groupCount, groupFails, hostCount, hostFails; var jobCount, jobFails, inventoryCount, inventoryFails, groupCount, groupFails, hostCount, hostFails;
var counts = 0; var counts = 0;
var expectedCounts = 6; var expectedCounts = 8;
var target = params.target; var target = params.target;
if (scope.removeCountReceived) { if (scope.removeCountReceived) {
@@ -34,12 +34,13 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
var fail = params.fail; var fail = params.fail;
html += "<tr>\n"; html += "<tr>\n";
html += "<td><a href=\"" + link + "\""; html += "<td><a href=\"" + link + "\"";
html += (label == 'Hosts' || label == 'Groups') ? " class=\"pad-left-sm\" " : "";
html += ">" + label + "</a></td>\n"; html += ">" + label + "</a></td>\n";
html += "<td class=\"failed-column text-right\">"; html += "<td class=\"failed-column text-right\">";
html += "<a href=\"" + fail_link + "\">" + fail + "</a>"; html += "<a href=\"" + fail_link + "\">" + fail + "</a>";
html += "</td>\n"; html += "</td>\n";
html += "<td class=\"text-right\">" html += "<td class=\"text-right\">"
html += "<a href=\"" + link + "\">" + count + "</a>"; html += "<a href=\"" + link + "\" >" + count + "</a>";
html += "</td></tr>\n"; html += "</td></tr>\n";
return html; return html;
} }
@@ -70,13 +71,23 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
}); });
rowcount++; rowcount++;
} }
if (inventoryCount > 0) {
html += makeRow({
label: 'Inventories',
link: '/#/home/inventories',
count: inventoryCount,
fail: inventoryFails,
fail_link: '/#/home/inventories/?has_active_failures=true'
});
rowcount++;
}
if (groupCount > 0) { if (groupCount > 0) {
html += makeRow({ html += makeRow({
label: 'Groups', label: 'Groups',
link: '/#/home/groups', link: '/#/home/groups',
count: groupCount, count: groupCount,
fail: groupFails, fail: groupFails,
fail_link: '/#/home/groups/?status=failed' fail_link: '/#/home/groups/?has_active_failures=true'
}); });
rowcount++; rowcount++;
} }
@@ -86,7 +97,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
link: '#/home/hosts', link: '#/home/hosts',
count: hostCount, count: hostCount,
fail: hostFails, fail: hostFails,
fail_link: '/#/home/hosts/?status=failed' fail_link: '/#/home/hosts/?has_active_failures=true'
}); });
rowcount++; rowcount++;
} }
@@ -132,7 +143,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
{ hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status }); { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
}); });
/*url = GetBasePath('inventory') + '?page=1'; url = GetBasePath('inventory') + '?page=1';
Rest.setUrl(url); Rest.setUrl(url);
Rest.get() Rest.get()
.success( function(data, status, headers, config) { .success( function(data, status, headers, config) {
@@ -154,7 +165,7 @@ angular.module('JobStatusWidget', ['RestServices', 'Utilities'])
.error( function(data, status, headers, config) { .error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, null, ProcessErrors(scope, data, status, null,
{ hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status }); { hdr: 'Error!', msg: 'Failed to get ' + url + '. GET status: ' + status });
});*/ });
url = GetBasePath('groups') + '?page=1'; url = GetBasePath('groups') + '?page=1';
Rest.setUrl(url); Rest.setUrl(url);