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

Merge pull request #269 from jlmitch5/fix_smart_status_order

Browse Source 
fixed smartstatus order
This commit is contained in:
jlmitch5 2015-06-05 17:20:52 -04:00
commit 422ee74811
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/static/js/smart-status/smart-status.controller.js
View File

@ -14,7 +14,7 @@ export default ['$scope', '$filter',
}
var sparkData =
recentJobs.map(function(job) {
_.sortBy(recentJobs.map(function(job) {
var data = {};
@ -28,10 +28,10 @@ export default ['$scope', '$filter',
data.jobId = job.id;
data.smartStatus = job.status;
data.finished = $filter('longDate')(job.finished);
data.finished = $filter('longDate')(job.finished) || "running";
return data;
});
}), "finished").reverse();
$scope.sparkArray = _.pluck(sparkData, 'value');
$scope.jobIds = _.pluck(sparkData, 'jobId');

9
awx/ui/static/js/smart-status/smart-status.directive.js
View File

@ -18,10 +18,13 @@ export default [ function() {
//capitalize first letter
if (status) {
status = status.charAt(0).toUpperCase() + status.slice(1);
return "<div class=\"smart-status-tooltip\">Job ID: " +
var tooltip = "<div class=\"smart-status-tooltip\">Job ID: " +
options.userOptions.tooltipValueLookups.jobs[point.offset] +
"<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status+
"<br>Finished: " + finished +"</div>" ;
"<br>Status: <span style=\"color: " + point.color + "\">&#9679;</span>"+status;
if (finished !== "running") {
tooltip += "<br>Finished: " + finished +"</div>" ;
}
return tooltip;
}
};