X-Git-Url: https://osm.etsi.org/gitweb/?p=osm%2FUI.git;a=blobdiff_plain;f=skyquake%2Fplugins%2Faccounts%2Fsrc%2Faccount%2FaccountSource.js;h=45067247a3aac77abe2fd4e8d17264e5ae6cea17;hp=c2aa4d495cd0cc62ec9a3dff578cd9d66cf19ffa;hb=a5a2c047b034a3616415854d58d25be19a43bd58;hpb=a6bd6f8c6d9c17c647b1c9f6e04b51676d14b53a;ds=sidebyside diff --git a/skyquake/plugins/accounts/src/account/accountSource.js b/skyquake/plugins/accounts/src/account/accountSource.js index c2aa4d495..45067247a 100644 --- a/skyquake/plugins/accounts/src/account/accountSource.js +++ b/skyquake/plugins/accounts/src/account/accountSource.js @@ -41,7 +41,7 @@ module.exports = function(Alt) { type: 'POST', beforeSend: Utils.addAuthorizationStub, data: { - url:window.location.protocol + '//' + window.location.host + '/accounts/all?api_server=' + API_SERVER + url:window.location.protocol + '//' + window.location.host + '/accounts/all?api_server=' + API_SERVER }, success: function(data, textStatus, jqXHR) { Utils.checkAndResolveSocketRequest(data, resolve, reject); @@ -222,7 +222,13 @@ module.exports = function(Alt) { beforeSend: Utils.addAuthorizationStub, contentType: "application/json", success: function(data) { - resolve(data["rw-launchpad:resource-orchestrator"]); + let returnedData; + if (data.hasOwnProperty("rw-launchpad:resource-orchestrator")) { + returnedData = data; + } else { + returnedData = {}; + } + resolve(returnedData); }, error: function(error) { console.log("There was an error updating the account: ", arguments); @@ -239,7 +245,7 @@ module.exports = function(Alt) { 'error': 'There was an error retrieving the resource orchestrator information.' }), success: Alt.actions.global.getResourceOrchestratorSuccess, - loading: Alt.actions.global.showScreenLoader, + loading: Alt.actions.global.showScreenLoader, error: Alt.actions.global.showNotification }, }