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

Job detail page

Browse Source 
Fixed key sorting. Turns out reverse() doesn't sort keys in reverse, it just reverses them. To sort in reverse: sort().reverse(). Ugh. Fixed JS liting issues for dashboard stuff.
This commit is contained in:
Chris Houseknecht
2014-07-02 12:43:31 -04:00
parent 7e45143fa1
commit cebc1d6030
3 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -947,7 +947,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
newKeys = [], newKeys = [],
plays = JSON.parse(JSON.stringify(scope.jobData.plays)), plays = JSON.parse(JSON.stringify(scope.jobData.plays)),
keys = Object.keys(plays); keys = Object.keys(plays);
keys.reverse(); keys.sort().reverse();
for (idx=0; idx < scope.playsMaxRows && idx < keys.length; idx++) { for (idx=0; idx < scope.playsMaxRows && idx < keys.length; idx++) {
newKeys.push(keys[idx]); newKeys.push(keys[idx]);
} }
@@ -973,7 +973,7 @@ function($rootScope, $log, UpdatePlayStatus, UpdateHostStatus, AddHostResult, Ge
if (scope.activePlay) { if (scope.activePlay) {
tasks = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks)); tasks = JSON.parse(JSON.stringify(scope.jobData.plays[scope.activePlay].tasks));
keys = Object.keys(tasks); keys = Object.keys(tasks);
keys.reverse(); keys.sort().reverse();
newKeys = []; newKeys = [];
for (idx=0; result.length < scope.tasksMaxRows && idx < keys.length; idx++) { for (idx=0; result.length < scope.tasksMaxRows && idx < keys.length; idx++) {
newKeys.push(keys[idx]); newKeys.push(keys[idx]);

8
awx/ui/static/js/widgets/HostGraph.js
View File

@@ -22,10 +22,10 @@ angular.module('HostGraphWidget', ['RestServices', 'Utilities'])
html = "<div class=\"graph-container\">\n"; html = "<div class=\"graph-container\">\n";
html +="<div class=\"row\">\n"; html +="<div class=\"row\">\n";
html += "<div class=\"h6 col-lg-12 text-center\">Hosts vs License Agreement</div>\n"; html += "<div class=\"h6 col-lg-12 text-center\">Hosts vs License Agreement</div>\n";
html += "<div class=\"host-count-graph\"><svg></svg></div>\n"; html += "<div class=\"host-count-graph\"><svg></svg></div>\n";
html += "</div>\n"; html += "</div>\n";
html += "</div>\n"; html += "</div>\n";
function makeHostCountGraph(){ function makeHostCountGraph(){

10
awx/ui/static/js/widgets/JobStatusGraph.js
View File

@@ -21,10 +21,10 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
html, element; html, element;
html = "<div class=\"graph-container\">\n"; html = "<div class=\"graph-container\">\n";
html +="<div class=\"row\">\n"; html +="<div class=\"row\">\n";
html += "<div class=\"h6 col-lg-12 text-center\">Job Status</div>\n"; html += "<div class=\"h6 col-lg-12 text-center\">Job Status</div>\n";
html += "<div class=\"job-status-graph\"><svg></svg></div>\n"; html += "<div class=\"job-status-graph\"><svg></svg></div>\n";
html += "</div>\n"; html += "</div>\n";
html += "</div>\n"; html += "</div>\n";
@@ -98,7 +98,7 @@ angular.module('JobStatusGraphWidget', ['RestServices', 'Utilities'])
element.html(html); element.html(html);
$compile(element)(scope); $compile(element)(scope);
makeJobStatusGraph(); makeJobStatusGraph();
scope.$emit('WidgetLoaded'); scope.$emit('WidgetLoaded');
}; };
} }