Correct bug

3 files changed, 29 insertions, 13 deletions

diff --git a/client/js/controllers/home/machineCreation.js b/client/js/controllers/home/machineCreation.js
index d1e6b6a..3996c68 100644
--- a/client/js/controllers/home/machineCreation.js
+++ b/client/js/controllers/home/machineCreation.js
@@ -6,20 +6,35 @@
 mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
     {
 
-
-        $scope.name = "loic"
+        $scope.name = "";
+        $('#pleaseChooseAnImage').hide();
         // When we need to show details of machine
         $scope.$on('showMachineCreationEvent', function (eventName, axioms) {
-            $scope.axioms=axioms;
+            $scope.axioms = axioms;
             $('#machineCreationModal').modal({backdrop: false, keyboard: true});
         });
-        
-        $scope.createMachine=function(){
-            machine={}
-            machine.name="loicTest"
-            machine.flavorId=1
-            machine.imageId="fd1ea580-a83e-4dc8-833c-96ce2b6f1358"
-          Compute.createMachine(function(){console.log("done")}, machine)
+
+        var callMeAfterMachineCreation=function(response){
+            Compute.pullData(function(){});
+        };
+
+        $scope.createMachine = function () {
+            if ($scope.selectedImage == null) {
+                $('#pleaseChooseAnImage').show();
+            } else {
+                $('#pleaseChooseAnImage').hide();
+                $('#machineCreationModal').modal("hide");
+
+                machine = {}
+                machine.name = $scope.name
+                machine.flavorId = 1
+                machine.imageId = $scope.selectedImage
+
+                
+                Compute.createMachine(callMeAfterMachineCreation, machine)
+                $scope.name="";
+
+            }
         };
 
     }]);
diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 06e296d..9ccb86b 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -42,7 +42,7 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
         };
 
         $scope.deleteMachine=function(){
-            Compute.deleteMachine(function(){console.log("deleted")},$scope.machine.id);
+            Compute.deleteMachine(function(){Compute.pullData(function(){});},$scope.machine.id);
         }
 
     }]);
diff --git a/client/js/services/Compute.js b/client/js/services/Compute.js
index ee2210c..992f20c 100644
--- a/client/js/services/Compute.js
+++ b/client/js/services/Compute.js
@@ -112,8 +112,9 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
 
             // Wait and handle the response
             result.then(function (response) {
-                callback();
-                console.log(response.data.Error)
+                console.log(response.data)
+                                callback();
+
             }, function (response) {
                 console.log("error")
                 callback();