diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 14:34:07 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 14:34:07 +0100 |
| commit | 8eafc905a933f5ca007050145a2c90015e8f618f (patch) | |
| tree | ce22021b4a38d073b8e1aac6d6f59bca59838182 /client/js | |
| parent | 76e748ab70232812cfbfe91f38cd5972c123bb86 (diff) | |
| parent | 53c6d3473a6c13c4375996c9e5fa6cacd828f282 (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client/js')
| -rw-r--r-- | client/js/services/Compute.js | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 8148948..e0c28ae 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -21,7 +21,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ "token" : Identity.getToken(), "task" : "compute", "action":"getServer", - "serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd" + "serverId":"a2926ce3-501b-4285-82ce-c6e451295599" }; var result=$http.post('../server/index.php', @@ -29,7 +29,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ // Wait and handle the response result.then(function (response){ - console.log(response.data.Servers); + console.log(response.data.MyServer.image); callback(parseGetMachinesAnswer(response, false)); },function(response){ alert(response.status); |