From 777a15f763977093f243bd97a9be60d1665ab808 Mon Sep 17 00:00:00 2001 From: jaredevantabor Date: Mon, 31 Oct 2016 12:36:28 -0700 Subject: [PATCH] fixing small typo in jobs.py and adding sockets to the new job results page --- awx/ui/client/src/job-results/event-queue.service.js | 4 ++-- awx/ui/client/src/job-results/job-results.route.js | 10 ++++++---- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/awx/ui/client/src/job-results/event-queue.service.js b/awx/ui/client/src/job-results/event-queue.service.js index 9d23295ac5..06be4d6ca6 100644 --- a/awx/ui/client/src/job-results/event-queue.service.js +++ b/awx/ui/client/src/job-results/event-queue.service.js @@ -132,7 +132,7 @@ export default ['jobResultsService', 'parseStdoutService', '$q', function(jobRes .then(count => { mungedEvent.count = count; mungedEvent.count.failed++; - mungedEvent.stdout = event.stdout; + mungedEvent.stdout = parseStdoutService.parseStdout(event); mungedEvent.changes = ['count', 'stdout']; }); } else if (event.event_name === 'playbook_on_stats') { @@ -140,7 +140,7 @@ export default ['jobResultsService', 'parseStdoutService', '$q', function(jobRes // get the data for populating the host status bar mungedEvent.count = jobResultsService .getCountsFromStatsEvent(event.event_data); - mungedEvent.stdout = event.stdout; + mungedEvent.stdout = parseStdoutService.parseStdout(event); mungedEvent.finishedTime = event.modified; mungedEvent.changes = ['count', 'countFinished', 'finishedTime', 'stdout']; } else { diff --git a/awx/ui/client/src/job-results/job-results.route.js b/awx/ui/client/src/job-results/job-results.route.js index 174f0068db..54e47e9655 100644 --- a/awx/ui/client/src/job-results/job-results.route.js +++ b/awx/ui/client/src/job-results/job-results.route.js @@ -15,10 +15,12 @@ export default { parent: 'jobs', label: '{{ job.id }} - {{ job.name }}' }, - socket: { - "groups":{ - "jobs": ["status_changed", "summary"], - "job_events": [] + data: { + socket: { + "groups":{ + "jobs": ["status_changed", "summary"], + "job_events": [] + } } }, resolve: {