From 9e3d4a99d2ce30733a384d61370e5397a4bd9819 Mon Sep 17 00:00:00 2001 From: mabashian Date: Wed, 23 Mar 2016 15:58:27 -0400 Subject: [PATCH] Added logic to not show the loop summary events in the UI by looking at event_data.event_loop. --- awx/ui/client/src/helpers/HostEventsViewer.js | 9 ++++++++- awx/ui/client/src/helpers/JobDetail.js | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/awx/ui/client/src/helpers/HostEventsViewer.js b/awx/ui/client/src/helpers/HostEventsViewer.js index e8fc5a940a..e68f82cada 100644 --- a/awx/ui/client/src/helpers/HostEventsViewer.js +++ b/awx/ui/client/src/helpers/HostEventsViewer.js @@ -3,7 +3,7 @@ * * All Rights Reserved *************************************************/ - + /** * @ngdoc function * @name helpers.function:HostEventsViewer @@ -273,6 +273,13 @@ export default .success(function(data) { var lastID; scope.hostViewSearching = false; + // Loop across the events and remove any events where + // event_data.event_loop is not null + for(var i=data.results.length-1; i>=0; i--){ + if(data.results[i].event_data && data.results[i].event_data.event_loop) { + data.results.splice(i, 1); + } + } if (data.results.length > 0) { lastID = data.results[data.results.length - 1].id; } diff --git a/awx/ui/client/src/helpers/JobDetail.js b/awx/ui/client/src/helpers/JobDetail.js index 3e54f37a5d..a151f655fb 100644 --- a/awx/ui/client/src/helpers/JobDetail.js +++ b/awx/ui/client/src/helpers/JobDetail.js @@ -1021,7 +1021,7 @@ export default } } - if (event.event !== "runner_on_no_hosts") { + if (event.event !== "runner_on_no_hosts" && (!event.event_data || (!event.event_data.event_loop || event.event_data.event_loop === null))) { scope.hostResults.push({ id: event.id, status: status,