diff --git a/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html b/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html index 695c256eb7..cf9dc67ac4 100644 --- a/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html +++ b/awx/ui/client/src/job-results/host-event/host-event-modal.partial.html @@ -18,6 +18,10 @@
CREATED {{(event.created | longDate) || "No result found"}} +
+
+ ID + {{event.id || "No result found"}}
PLAY @@ -29,7 +33,7 @@
MODULE - {{event.event_data.res.invocation.module_name || "No result found"}} + {{module_name}}
diff --git a/awx/ui/client/src/job-results/host-event/host-event.controller.js b/awx/ui/client/src/job-results/host-event/host-event.controller.js index 6d727e9d9b..b9c82312e9 100644 --- a/awx/ui/client/src/job-results/host-event/host-event.controller.js +++ b/awx/ui/client/src/job-results/host-event/host-event.controller.js @@ -48,17 +48,23 @@ hostEvent.event_name = hostEvent.event; $scope.event = _.cloneDeep(hostEvent); $scope.hostResults = hostResults; - $scope.json = JobDetailService.processJson(hostEvent); // grab standard out & standard error if present from the host // event's "res" object, for things like Ansible modules try{ + $scope.module_name = hostEvent.event_data.res.invocation.module_name || hostEvent.event_data.res.task_action || "No result found"; $scope.stdout = hostEvent.event_data.res.stdout; $scope.stderr = hostEvent.event_data.res.stderr; + $scope.json = hostEvent.event_data.res; } catch(err){ // do nothing, no stdout/stderr for this module } + if($scope.module_name === "yum" && + hostEvent.event_data.res.hasOwnProperty('results') && + _.isArray(hostEvent.event_data.res.results)){ + $scope.stdout = hostEvent.event_data.res.results[0]; + } // instantiate Codemirror // try/catch pattern prevents the abstract-state controller from complaining about element being null if ($state.current.name === 'jobDetail.host-event.json'){