-
+
\ No newline at end of file
+
diff --git a/awx/ui/client/src/job-detail/host-events/host-events.route.js b/awx/ui/client/src/job-detail/host-events/host-events.route.js
index bf983b8f00..835d17b2b9 100644
--- a/awx/ui/client/src/job-detail/host-events/host-events.route.js
+++ b/awx/ui/client/src/job-detail/host-events/host-events.route.js
@@ -8,7 +8,7 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default {
name: 'jobDetail.host-events',
- url: '/host-events/:hostName?:filter',
+ url: '/host-events/{hostName:any}?:filter',
controller: 'HostEventsController',
params: {
page_size: 10
diff --git a/awx/ui/client/src/job-detail/host-summary/host-summary.route.js b/awx/ui/client/src/job-detail/host-summary/host-summary.route.js
index 287b565260..0c2f30cb21 100644
--- a/awx/ui/client/src/job-detail/host-summary/host-summary.route.js
+++ b/awx/ui/client/src/job-detail/host-summary/host-summary.route.js
@@ -9,20 +9,6 @@ import {templateUrl} from '../../shared/template-url/template-url.factory';
export default {
name: 'jobDetail.host-summary',
url: '/event-summary',
- /*
- resolve: {
- jobSocket: ['Socket', '$rootScope', function(Socket, $rootScope) {
- var job_socket = Socket({
- scope: $rootScope,
- endpoint: "jobs"
- });
- if (!$rootScope.event_socket){
- job_socket.init();
- }
- return job_socket;
- }]
- },
- */
views:{
'host-summary': {
controller: 'HostSummaryController',
diff --git a/awx/ui/client/src/job-detail/job-detail.controller.js b/awx/ui/client/src/job-detail/job-detail.controller.js
index 2e927fad2c..504d8fe4dd 100644
--- a/awx/ui/client/src/job-detail/job-detail.controller.js
+++ b/awx/ui/client/src/job-detail/job-detail.controller.js
@@ -11,13 +11,13 @@
*/
export default
- [ '$location', '$rootScope', '$filter', '$scope', '$compile', '$stateParams', '$log', 'ClearScope',
+ [ '$location', '$rootScope', '$filter', '$scope', '$compile', '$state', '$stateParams', '$log', 'ClearScope',
'GetBasePath', 'Wait', 'ProcessErrors', 'SelectPlay', 'SelectTask', 'GetElapsed', 'JobIsFinished',
'SetTaskStyles', 'DigestEvent', 'UpdateDOM', 'DeleteJob', 'InitiatePlaybookRun', 'LoadPlays', 'LoadTasks',
'ParseVariableString', 'GetChoices', 'fieldChoices', 'fieldLabels', 'EditSchedule',
'ParseTypeChange', 'JobDetailService',
function(
- $location, $rootScope, $filter, $scope, $compile, $stateParams, $log, ClearScope,
+ $location, $rootScope, $filter, $scope, $compile, $state, $stateParams, $log, ClearScope,
GetBasePath, Wait, ProcessErrors, SelectPlay, SelectTask, GetElapsed, JobIsFinished,
SetTaskStyles, DigestEvent, UpdateDOM, DeleteJob, InitiatePlaybookRun, LoadPlays, LoadTasks,
ParseVariableString, GetChoices, fieldChoices, fieldLabels, EditSchedule,
@@ -160,8 +160,14 @@ export default
scope.processing = false;
scope.lessStatus = false;
scope.lessDetail = false;
- scope.lessEvents = true;
-
+ // pops the event summary panel open if we're in the host summary child state
+ //scope.lessEvents = ($state.current.name === 'jobDetail.host-summary' || $state.current.name === 'jobDetail.host-events') ? false : true;
+ if ($state.current.name === 'jobDetail.host-summary' ){
+ scope.lessEvents = false;
+ }
+ else{
+ scope.lessEvents = true;
+ }
scope.jobData = {};
scope.jobData.hostSummaries = {};
diff --git a/awx/ui/client/src/job-detail/job-detail.service.js b/awx/ui/client/src/job-detail/job-detail.service.js
index 719bf140c5..61b67b1035 100644
--- a/awx/ui/client/src/job-detail/job-detail.service.js
+++ b/awx/ui/client/src/job-detail/job-detail.service.js
@@ -41,8 +41,7 @@ export default
});
}
catch(err){result.event_data = undefined;}
-
- return result;
+ return result === {} ? null : result;
},
// Return Ansible's passed-through response msg on a job_event
processEventMsg: function(event){