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

AC-378 applied new sort routine to inventory groups page.

Browse Source
This commit is contained in:
chouseknecht 2013-09-02 01:29:51 -04:00
parent d9ba08e8cb
commit cde035f06d
5 changed files with 47 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
awx/ui/static/js/forms/InventoryHosts.js
View File

@ -39,6 +39,8 @@ angular.module('InventoryHostsFormDefinition', [])
"class": "btn-sm",
//ngDisabled: 'host.last_job == null',
options: [
{ ngClick: 'allJobs()', label: 'All jobs', ngShow: 'host.last_job' },
{ ngClick: 'allSummaries()', label: 'All host summaries', ngShow: 'host.last_job' },
{ ngClick: 'viewJobs(\{\{ host.last_job \}\})', label: 'Latest job', ngShow: 'host.last_job' },
{ ngClick: "viewLastEvents(\{\{ host.id \}\}, '\{\{ host.last_job \}\}', '\{\{ host.name \}\}', " +
"'\{\{ host.summary_fields.last_job.name \}\}')", label: 'Latest job events', ngShow: 'host.last_job' },

8
awx/ui/static/js/forms/Jobs.js
View File

@ -281,15 +281,15 @@ angular.module('JobFormDefinition', [])
label: 'Refresh',
icon: 'icon-refresh',
ngClick: "refresh()",
"class": 'btn-small btn-success',
"class": 'btn-sm btn-success',
awToolTip: 'Refresh job status & output',
mode: 'all'
},
summary: {
label: 'Hosts',
icon: 'icon-th-large',
icon: 'icon-laptop',
ngClick: "jobSummary()",
"class": 'btn btn-default btn-small',
"class": 'btn btn-default btn-sm',
awToolTip: 'View host summary',
mode: 'all'
},
@ -297,7 +297,7 @@ angular.module('JobFormDefinition', [])
label: 'Events',
icon: 'icon-list-ul',
ngClick: "jobEvents()",
"class": 'btn btn-default btn-small',
"class": 'btn btn-default btn-sm',
awToolTip: 'Edit job events',
mode: 'all'
}

55
awx/ui/static/js/helpers/Hosts.js
View File

@ -468,20 +468,39 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
var inventory_id = params.inventory_id;
var html = '';
function sortNodes(data) {
//Sort nodes by name
var names = [];
var newData = [];
for (var i=0; i < data.length; i++) {
names.push(data[i].name);
}
names.sort();
for (var j=0; j < names.length; j++) {
for (i=0; i < data.length; i++) {
if (data[i].name == names[j]) {
newData.push(data[i]);
}
}
}
return newData;
}
function buildHTML(tree_data) {
html += (tree_data.length > 0) ? "<ul>\n" : "";
for(var i=0; i < tree_data.length; i++) {
html += "<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + tree_data[i].related.hosts + "\" " +
"data-description=\"" + tree_data[i].description + "\" " +
"data-failures=\"" + tree_data[i].has_active_failures + "\" " +
"data-groups=\"" + tree_data[i].related.groups + "\" " +
"data-name=\"" + tree_data[i].name + "\" " +
"data-group-id=\"" + tree_data[i].id + "\" " +
var sorted = sortNodes(tree_data);
html += (sorted.length > 0) ? "<ul>\n" : "";
for(var i=0; i < sorted.length; i++) {
html += "<li id=\"search-node-1000\" data-state=\"opened\" data-hosts=\"" + sorted[i].related.hosts + "\" " +
"data-description=\"" + sorted[i].description + "\" " +
"data-failures=\"" + sorted[i].has_active_failures + "\" " +
"data-groups=\"" + sorted[i].related.groups + "\" " +
"data-name=\"" + sorted[i].name + "\" " +
"data-group-id=\"" + sorted[i].id + "\" " +
"><a href=\"\" class=\"expand\"><i class=\"icon-caret-down\"></i></a> " +
"<i class=\"field-badge icon-failures-" + tree_data[i].has_active_failures + "\"></i> " +
"<a href=\"\" class=\"activate\">" + tree_data[i].name + "</a> ";
if (tree_data[i].children.length > 0) {
buildHTML(tree_data[i].children);
"<i class=\"field-badge icon-failures-" + sorted[i].has_active_failures + "\"></i> " +
"<a href=\"\" class=\"activate\">" + sorted[i].name + "</a> ";
if (sorted[i].children.length > 0) {
buildHTML(sorted[i].children);
}
else {
html += "</li>\n";
@ -608,7 +627,8 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
{ hdr: 'Error!', msg: 'Failed to get inventory tree for: ' + inventory_id + '. GET returned: ' + status });
});
});
/*
if (scope.buildGroupListRemove) {
scope.buildGroupListRemove();
}
@ -616,20 +636,23 @@ angular.module('HostsHelper', [ 'RestServices', 'Utilities', 'ListGenerator', 'H
scope.inventory_groups = [];
Rest.setUrl(groups_url);
Rest.get()
.success( function(data, status, headers, config) {
.success( function(data, status, headers, config) {
var groups = [];
for (var i=0; i < data.results.length; i++) {
scope.inventory_groups.push({
groups.push({
id: data.results[i].id,
description: data.results[i].description,
name: data.results[i].name });
}
scope.inventory_groups = sortNodes(groups);
})
.error( function(data, status, headers, config) {
ProcessErrors(scope, data, status, null,
{ hdr: 'Error!', msg: 'Failed to get groups for inventory: ' + inventory_id + '. GET returned: ' + status });
});
});
*/
Wait('start');
// Load the inventory root node

2
awx/ui/static/js/lists/JobEvents.js
View File

@ -76,7 +76,7 @@ angular.module('JobEventsListDefinition', [])
},
summary: {
label: 'Hosts',
icon: 'icon-th-large',
icon: 'icon-laptop',
ngClick: "jobSummary()",
"class": 'btn btn-default btn-sm',
awToolTip: 'View host summary',

2
awx/ui/static/js/lists/Jobs.js
View File

@ -68,7 +68,7 @@ angular.module('JobsListDefinition', [])
fieldActions: {
summary: {
label: 'Hosts',
icon: 'icon-th-large',
icon: 'icon-laptop',
ngClick: "viewSummary(\{{ job.id \}\}, '\{\{ job.name \}\}')",
"class": 'btn btn-default btn-xs',
awToolTip: 'View host summary',