Merge branch 'loic' into develop

This commit is contained in:
manzerbredes 2016-03-01 19:08:36 +01:00
commit b106a086b5

View file

@ -14,7 +14,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
var requestParserResult={};
requestParserResult.status=1;
requestParserResult.failReason=null;
console.log(response.data.Images[Object.keys(response.data.Images)[0]])
console.log(response.data.Servers[Object.keys(response.data.Servers)[0]])
if (typeof response.data.Servers !== 'undefined') {
// Set status code
requestParserResult.status=0;
@ -40,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){
var params={
"token" : Identity.getToken(),
"task" : "compute",
"action":"listImages"
"action":"listServers"
};
var result=$http.post('../server/index.php',