Test

3 files changed, 15 insertions, 11 deletions

diff --git a/client/js/controllers/home/home.js b/client/js/controllers/home/home.js
index 2440494..4fa7504 100755
--- a/client/js/controllers/home/home.js
+++ b/client/js/controllers/home/home.js
@@ -144,7 +144,9 @@ mainApp.controller('homeCtrl', ['$scope', 'Compute', '$rootScope', 'Loading', 'I
 	
 	// On user login
 	$scope.$on('updateGraphEvent', function () {
-		displayMachine()
+                                alert("called")
+
+		displayMachine();
 	});
 	//Return a new link linking the parent and child elements with the interfaces names given in parameters 
 	function makeLink(parentElementLabel, childElementLabel, Iparent, Ichild) {
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 752bea3..78aa532 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -7,42 +7,43 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
     {
 
 
-        // Init scope
+// Init scope
         $scope.machine = {};
         $scope.machineIsStarting = false; // For loading icon
 
         // When we need to show details of machine
         $scope.$on('showMachineDetailsEvent', function (eventName, machine, axioms) {
             $scope.machine = machine;
-           // console.log(machine.flavor)
+            // console.log(machine.flavor)
             $scope.axioms = axioms;
             $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
         });
-
         // Try to stop or start a machine
         $scope.toggleMachineState = function () {
             // Display gif
             $scope.machineIsStarting = true;
-
             // Fake timeout
             $timeout(function () {
                 $scope.machineIsStarting = false;
             }, 3000);
             $timeout(function () {
                 $scope.machine.online = !$scope.machine.online;
-
             }, 3000);
-
-
         };
-
         // Apply modifications
         $scope.applyModifications = function () {
             //Todo
         };
+        $scope.deleteMachine = function () {
+            var call = function () {
+                Compute.pullData(function () {
+                    $rootScope.$broadcast("updateGraphEvent");
+                });
+            }
+
+
 
-        $scope.deleteMachine=function(){
-            Compute.deleteMachine(function(){Compute.pullData(function(){$rootScope.$broadcast("updateGraphEvent")});},$scope.machine.id);
+            Compute.deleteMachine(call, $scope.machine.id);
         }
 
     }]);
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index 992f20c..1d1aeb5 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -128,6 +128,7 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
 
             // Wait and handle the response
             result.then(function (response) {
+                
                 callback();
                 console.log(response.data.Error)
             }, function (response) {