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

Job detail page refactor

Browse Source 
Fixed host result sort order
This commit is contained in:
Chris Houseknecht
2014-06-24 13:58:39 -04:00
parent f78197970e
commit 1e3f2c02e9
2 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
awx/ui/static/js/helpers/JobDetail.js
View File

@@ -926,19 +926,16 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
if (scope.activePlay && scope.activeTask) { if (scope.activePlay && scope.activeTask) {
hostResults = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks[scope.activeTask].hostResults)); hostResults = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks[scope.activeTask].hostResults));
keys = Object.keys(hostResults); keys = Object.keys(hostResults);
keys.sort(function(a,b) {
/*keys.sort(function(a,b) {
if (hostResults[a].name > hostResults[b].name) if (hostResults[a].name > hostResults[b].name)
return 1;
if (hostResults[a].name < hostResults[b].name)
return -1; return -1;
if (hostResults[a].name < hostResults[b].name)
return 1;
// a must be equal to b // a must be equal to b
return 0; return 0;
});*/ });
keys.reverse();
while (idx < keys.length && idx < scope.hostResultsMaxRows) { while (idx < keys.length && idx < scope.hostResultsMaxRows) {
result.push(hostResults[keys[idx]]); result.unshift(hostResults[keys[idx]]);
idx++; idx++;
} }
} }

4
awx/ui/static/lib/ansible/list-generator.js
View File

@@ -11,9 +11,9 @@
angular.module('ListGenerator', ['GeneratorHelpers']) angular.module('ListGenerator', ['GeneratorHelpers'])
.factory('GenerateList', ['$location', '$compile', '$rootScope', 'SearchWidget', 'PaginateWidget', 'Attr', 'Icon', .factory('GenerateList', ['$location', '$compile', '$rootScope', 'SearchWidget', 'PaginateWidget', 'Attr', 'Icon',
'Column', 'DropDown', 'NavigationLink', 'Button', 'SelectIcon', 'Breadcrumbs', 'Column', 'DropDown', 'NavigationLink', 'Button', 'SelectIcon',
function ($location, $compile, $rootScope, SearchWidget, PaginateWidget, Attr, Icon, Column, DropDown, NavigationLink, function ($location, $compile, $rootScope, SearchWidget, PaginateWidget, Attr, Icon, Column, DropDown, NavigationLink,
Button, SelectIcon, Breadcrumbs) { Button, SelectIcon) {
return { return {
setList: function (list) { setList: function (list) {