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

hack around start line 1, end line 1

Browse Source
This commit is contained in:
John Mitchell
2017-01-31 17:01:34 -05:00
parent eada4ce83f
commit 2e93fc22e2
1 changed files with 10 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -202,6 +202,11 @@ export default ['$log', 'moment', function($log, moment){
let lineNums = _.range(event.start_line + 1, let lineNums = _.range(event.start_line + 1,
event.end_line + 1); event.end_line + 1);
// hack around no-carriage return issues
if (!lineNums.length) {
lineNums = [event.start_line + 1];
}
let lines = event.stdout let lines = event.stdout
.replace("\t", " ") .replace("\t", " ")
.split("\r\n"); .split("\r\n");
@@ -214,6 +219,11 @@ export default ['$log', 'moment', function($log, moment){
} }
} }
// hack around no-carriage return issues
if (lineNums.length === lines.length) {
return _.zip(lineNums, lines);
}
return _.zip(lineNums, lines).slice(0, -1); return _.zip(lineNums, lines).slice(0, -1);
}, },
// public function that provides the parsed stdout line, given a // public function that provides the parsed stdout line, given a