External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-09 05:29:26 -02:30
Code Issues Packages Projects Releases Wiki Activity

Sockets - avoid sending invalid JSON when entering state with no socket

Browse Source 
definition.
This commit is contained in:
Leigh Johnson
2016-10-28 15:39:48 -04:00
parent a49095bdbc
commit d253eabe5d
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
awx/ui/client/src/shared/socket/socket.service.js
View File

@@ -135,7 +135,7 @@ export default
// to the API: {"groups": {}}. // to the API: {"groups": {}}.
// This is used for all pages that are socket-disabled // This is used for all pages that are socket-disabled
if(this.requiresNewSubscribe(state)){ if(this.requiresNewSubscribe(state)){
this.emit(JSON.stringify(state.data.socket)); this.emit(JSON.stringify(state.data.socket) || JSON.stringify({"groups": {}}));
} }
this.setLast(state); this.setLast(state);
}, },
@@ -205,8 +205,8 @@ export default
// requires a subscribe or an unsubscribe // requires a subscribe or an unsubscribe
var self = this; var self = this;
socketPromise.promise.then(function(){ socketPromise.promise.then(function(){
if(!state.data && !state.data.socket){ if(!state.data || !state.data.socket){
state.data.socket = {groups: {}}; _.merge(state.data, {socket: {groups: {}}});
self.unsubscribe(state); self.unsubscribe(state);
} }
else{ else{