shaba/awx
1
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2024-11-01 08:21:15 +03:00
Code Releases Activity

fixed kickback on #2795 (#2884)

Browse Source
This commit is contained in:
Leigh Johnson 2016-07-11 12:09:16 -04:00 committed by GitHub
parent dac460c2f8
commit fed8a83b08
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
awx/ui/client/src/smart-status/smart-status.controller.js
View File

@ -32,6 +32,7 @@ export default ['$scope', '$filter',
data.jobId = job.id; data.jobId = job.id;
data.sortDate = job.finished || "running" + data.jobId; data.sortDate = job.finished || "running" + data.jobId;
data.finished = $filter('longDate')(job.finished) || job.status+""; data.finished = $filter('longDate')(job.finished) || job.status+"";
data.status_tip = "JOB ID: " + data.jobId + "<br>STATUS: " + data.smartStatus + "<br>FINISHED: " + data.finished;
return data; return data;
}), "sortDate").reverse(); }), "sortDate").reverse();

4
awx/ui/client/src/smart-status/smart-status.partial.html
View File

@ -1,8 +1,8 @@
<div class="SmartStatus-container"> <div class="SmartStatus-container">
<div ng-repeat="job in sparkArray track by $index" class='SmartStatus-iconContainer'> <div ng-repeat="job in sparkArray track by $index" class='SmartStatus-iconContainer'>
<a href="#/jobs/{{ job.jobId }}" <a href="#/jobs/{{ job.jobId }}"
aw-tool-tip=" aw-tool-tip="{{job.status_tip}}"
JOB ID: {{job.jobId}} <br>STATUS: {{job.smartStatus}} <br>FINISHED: {{job.finished}}" data-tip-watch="job.status_tip"
aw-tip-placement="left" aw-tip-placement="left"
data-original-title="" data-original-title=""
data-trigger="hover" data-trigger="hover"