External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-01-11 10:00:01 -03:30
Code Issues Packages Projects Releases Wiki Activity

Sending blank object to socket server on routes that are not

Browse Source 
websocket enabled.
This commit is contained in:
Jared Tabor 2016-09-13 10:07:06 -07:00
parent 947571fe26
commit 1510d826a6
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
awx/ui/client/src/shared/stateExtender.provider.js
View File

@ -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,