From 1510d826a667fb16a14c3edbb2a9518978cedbf3 Mon Sep 17 00:00:00 2001 From: Jared Tabor Date: Tue, 13 Sep 2016 10:07:06 -0700 Subject: [PATCH] Sending blank object to socket server on routes that are not websocket enabled. --- .../src/shared/stateExtender.provider.js | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/awx/ui/client/src/shared/stateExtender.provider.js b/awx/ui/client/src/shared/stateExtender.provider.js index d58c530a4c..54f292a659 100644 --- a/awx/ui/client/src/shared/stateExtender.provider.js +++ b/awx/ui/client/src/shared/stateExtender.provider.js @@ -9,12 +9,18 @@ export default function($stateProvider) { state.resolve.socket = ['SocketService', '$rootScope', '$stateParams', function(SocketService, $rootScope, $stateParams) { $rootScope.socketPromise.promise.then(function(){ - if(state.socket.groups.hasOwnProperty( "job_events")){ - state.socket.groups.job_events = [$stateParams.id]; + if(!state.socket){ + state.socket = {groups: {}}; } - if(state.socket.groups.hasOwnProperty( "ad_hoc_command_events")){ - state.socket.groups.job_events = [$stateParams.id]; + else{ + if(state.socket.groups.hasOwnProperty( "job_events")){ + state.socket.groups.job_events = [$stateParams.id]; + } + if(state.socket.groups.hasOwnProperty( "ad_hoc_command_events")){ + state.socket.groups.job_events = [$stateParams.id]; + } } + SocketService.subscribe(state); return true; }); @@ -24,9 +30,7 @@ export default function($stateProvider) { addState: function(state) { var route = state.route || state.url; - if(state.socket){ - this.addSocket(state); - } + this.addSocket(state); $stateProvider.state(state.name, { url: route,