Correct machine details bug

4 files changed, 6 insertions, 6 deletions

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index f6e6b84..2aed337 100755
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -5,7 +5,6 @@
  */
 mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','Identity', 'Image', function ($scope, Compute, $rootScope, Loading, Identity, Image)
 {
-	console.log("test");
 	// Function to call after pull all data about machines
 	var callMeAfterPullData=function(data){
 		//$scope.machines=Compute.getData().machines;
@@ -51,7 +50,6 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
   tryToRetrieveData();
 	
 	var displayMachine = function(){
-		console.log("test");
 		var machineNames = [];
 		var i = 0;
 		$.each(Compute.getData().machines, function(){
@@ -158,7 +156,7 @@ mainApp.controller('homeCtrl', [ '$scope', 'Compute', '$rootScope', 'Loading','I
 		var width = 130;
 		var height = 80;
 		var data = Compute.getData();
-		console.log(data.machines[vm[1]]);
+		//console.log(data.machines[vm[1]]);
 		if(data.machines[vm[1]].status == "ACTIVE"){
 			return new joint.shapes.org.Member({
 				id: vm[1],
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 9c8c602..cd7bb57 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -14,6 +14,7 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
         // When we need to show details of machine
         $scope.$on('showMachineDetailsEvent', function (eventName, machine, axioms) {
             $scope.machine = machine;
+           // console.log(machine.flavor)
             $scope.axioms = axioms;
             $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
         });
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 5e95f22..712b9a2 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -40,8 +40,9 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
 
 
         /**
-         * Retrieve machine list 
-         * @param {callback} function to call after request complete
+         * Retrieve machine list
+         * @param {type} callback function to call after request complete
+         * @returns {undefined}
          */
         var pullMachines = function (callback) {
             // Send listServers request
diff --git a/server/core/Compute.php b/server/core/Compute.php
index 1db21bf..7783fde 100755
--- a/server/core/Compute.php
+++ b/server/core/Compute.php
@@ -65,9 +65,9 @@ class compute implements Core
 			$servers = Array();
 			foreach($serverList as $server){
 				$servers[$server->id] = Array();
+                                $server->retrieve();
 				$server->flavor->retrieve();
 				$server->image->retrieve();
-				$server->retrieve();
 				$servers[$server->id]["id"]  = $server->id;
 				$servers[$server->id]["name"] = $server->name;
 				$servers[$server->id]["image"] = $server->image;