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

Merge pull request #6074 from jlmitch5/fixEscapingStdout

Browse Source 
Fix escaping stdout
This commit is contained in:
jlmitch5
2017-04-24 11:47:39 -04:00
committed by GitHub
parent 74636d3623 a44e5b208a
commit 7d7d1daae7
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -289,7 +289,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)}><span ng-non-bindable>${this.prettify(lineArr[1])}</span>${this.getStartTimeBadge(event, lineArr[1])}</div>
</div>`; </div>`;
}); });

2
awx/ui/tests/spec/job-results/parse-stdout.service-test.js
View File

@@ -204,7 +204,7 @@ describe('parseStdoutService', () => {
var expectedString = ` var expectedString = `
<div class="JobResultsStdOut-aLineOfStdOutline_classes"> <div class="JobResultsStdOut-aLineOfStdOutline_classes">
<div class="JobResultsStdOut-lineNumberColumn">collapse_icon_dom13</div> <div class="JobResultsStdOut-lineNumberColumn">collapse_icon_dom13</div>
<div class="JobResultsStdOut-stdoutColumn" anchor_tag_dom>prettified_line </div> <div class="JobResultsStdOut-stdoutColumn" anchor_tag_dom><span ng-non-bindable>prettified_line</span></div>
</div>`; </div>`;
expect(returnedString).toBe(expectedString); expect(returnedString).toBe(expectedString);
}); });