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

move anchor tag stdout line dom to parent element

Browse Source
This commit is contained in:
John Mitchell
2016-12-02 12:15:19 -05:00
parent 24b858c6fb
commit 93fd3de34f
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
awx/ui/client/src/job-results/parse-stdout.service.js
View File

@@ -64,12 +64,12 @@ export default ['$log', 'moment', function($log, moment){
return line; return line;
}, },
// adds anchor tags and tooltips to host status lines // adds anchor tags and tooltips to host status lines
getAnchorTags: function(event, line){ getAnchorTags: function(event){
if(event.event_name.indexOf("runner_") === -1){ if(event.event_name.indexOf("runner_") === -1){
return line; return `"`;
} }
else{ else{
return `<a ui-sref="jobDetail.host-event.stdout({eventId: ${event.id}, taskId: ${event.parent} })" aw-tool-tip="Event ID: ${event.id} <br>Status: ${event.event_display} <br>Click for details" data-placement="top">${line}</a>`; return ` JobResultsStdOut-stdoutColumn--clickable" ui-sref="jobDetail.host-event.stdout({eventId: ${event.id}, taskId: ${event.parent} })" aw-tool-tip="Event ID: ${event.id} <br>Status: ${event.event_display} <br>Click for details" data-placement="top"`;
} }
}, },
@@ -104,7 +104,8 @@ export default ['$log', 'moment', function($log, moment){
if (event.event_data.play_uuid) { if (event.event_data.play_uuid) {
string += " play_" + event.event_data.play_uuid; string += " play_" + event.event_data.play_uuid;
} }
} else { } else if (event.event_name !== "playbook_on_stats"){
string += " not_skeleton";
// host status or debug line // host status or debug line
// these get classed by their parent play if applicable // these get classed by their parent play if applicable
@@ -216,7 +217,7 @@ export default ['$log', 'moment', function($log, moment){
return ` return `
<div class="JobResultsStdOut-aLineOfStdOut${this.getLineClasses(event, lineArr[1], lineArr[0])}"> <div class="JobResultsStdOut-aLineOfStdOut${this.getLineClasses(event, lineArr[1], lineArr[0])}">
<div class="JobResultsStdOut-lineNumberColumn">${this.getCollapseIcon(event, lineArr[1])}${lineArr[0]}</div> <div class="JobResultsStdOut-lineNumberColumn">${this.getCollapseIcon(event, lineArr[1])}${lineArr[0]}</div>
<div class="JobResultsStdOut-stdoutColumn">${this.getAnchorTags(event, this.prettify(lineArr[1]))} ${this.getStartTimeBadge(event, lineArr[1] )}</div> <div class="JobResultsStdOut-stdoutColumn${this.getAnchorTags(event)}>${this.prettify(lineArr[1])} ${this.getStartTimeBadge(event, lineArr[1])}</div>
</div>`; </div>`;
}); });