diff options
| author | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 16:55:42 +0100 |
|---|---|---|
| committer | manzerbredes <loic.guegan_secondary@yahoo.fr> | 2016-03-01 16:55:42 +0100 |
| commit | df7cfba96b5e3d99cd186284d79592af473859fc (patch) | |
| tree | b01cc08d23550e0a0ba6d402fcfadc1de45aa86b /client | |
| parent | f551dffd8a960d4a322ba2b99fd98a02dd98b402 (diff) | |
| parent | bb8b3dd14060bbad8d4c1295c8395b5cb1108e59 (diff) | |
Merge branch 'loic' into develop
Diffstat (limited to 'client')
| -rw-r--r-- | client/js/controllers/home/main.js | 1 | ||||
| -rw-r--r-- | client/js/services/Compute.js | 5 |
2 files changed, 3 insertions, 3 deletions
diff --git a/client/js/controllers/home/main.js b/client/js/controllers/home/main.js index 805bc63..ee564b2 100644 --- a/client/js/controllers/home/main.js +++ b/client/js/controllers/home/main.js @@ -17,7 +17,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', function ($s $scope.raiseShowMachineDetailsEvent=function(){ var callback=function(){ var data=Compute.getData(); - console.log(data.machines[Object.keys(data.machines)[0]]); $rootScope.$broadcast("showMachineDetailsEvent", data.machines[Object.keys(data.machines)[0]]); } diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js index 7c9df26..28f8a69 100644 --- a/client/js/services/Compute.js +++ b/client/js/services/Compute.js @@ -14,11 +14,12 @@ 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]]) if (typeof response.data.Servers !== 'undefined') { // Set status code requestParserResult.status=0; data.machines=response.data.Servers; + } else if(failedToSendRequest){ requestParserResult.failReason="Failed to send request"; @@ -39,7 +40,7 @@ mainApp.factory('Compute',[ '$http', 'Identity', function($http, Identity){ var params={ "token" : Identity.getToken(), "task" : "compute", - "action":"listServers" + "action":"listImages" }; var result=$http.post('../server/index.php', |