From 2e93fc22e26843c04012e6ef0a0e16fe05c93a03 Mon Sep 17 00:00:00 2001 From: John Mitchell Date: Tue, 31 Jan 2017 17:01:34 -0500 Subject: [PATCH] hack around start line 1, end line 1 --- awx/ui/client/src/job-results/parse-stdout.service.js | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/awx/ui/client/src/job-results/parse-stdout.service.js b/awx/ui/client/src/job-results/parse-stdout.service.js index 8630c0fa07..8c7e91f755 100644 --- a/awx/ui/client/src/job-results/parse-stdout.service.js +++ b/awx/ui/client/src/job-results/parse-stdout.service.js @@ -202,6 +202,11 @@ export default ['$log', 'moment', function($log, moment){ let lineNums = _.range(event.start_line + 1, event.end_line + 1); + // hack around no-carriage return issues + if (!lineNums.length) { + lineNums = [event.start_line + 1]; + } + let lines = event.stdout .replace("\t", " ") .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); }, // public function that provides the parsed stdout line, given a