loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'loic' into develop

Browse source
This commit is contained in:
manzerbredes 2016-03-01 14:34:07 +01:00
commit 8eafc905a9
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
client/js/services/Compute.js
View file

@ -21,7 +21,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
"token" : Identity.getToken(), "token" : Identity.getToken(),
"task" : "compute", "task" : "compute",
"action":"getServer", "action":"getServer",
"serverId":"69d5bcc4-2fab-4634-b0d2-f455fee5b7bd" "serverId":"a2926ce3-501b-4285-82ce-c6e451295599"
}; };
var result=$http.post('../server/index.php', var result=$http.post('../server/index.php',
@ -29,7 +29,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
// Wait and handle the response // Wait and handle the response
result.then(function (response){ result.then(function (response){
console.log(response.data.Servers); console.log(response.data.MyServer.image);
callback(parseGetMachinesAnswer(response, false)); callback(parseGetMachinesAnswer(response, false));
},function(response){ },function(response){
alert(response.status); alert(response.status);