From 21ed091ba6209d9c6fdaf9191412515a5f01d82f Mon Sep 17 00:00:00 2001
From: Loic GUEGAN <loic@Manzerbredes.home>
Date: Fri, 6 May 2016 14:37:02 +0200
Subject: [PATCH] Correct bugs

---
 client/js/controllers/home/machineDetails.js |  5 ++++-
 client/js/services/Image.js                  | 13 +++++++------
 client/partials/home/machineDetails.html     |  2 +-
 3 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/client/js/controllers/home/machineDetails.js b/client/js/controllers/home/machineDetails.js
index 78aa532..21ed07c 100644
--- a/client/js/controllers/home/machineDetails.js
+++ b/client/js/controllers/home/machineDetails.js
@@ -3,7 +3,7 @@
  * 
  * @param {$scope} $scope The $scope service from angular
  */
-mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
+mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', 'Image', function ($scope, Compute, $rootScope, $timeout, Identity, Image)
     {
 
 
@@ -16,6 +16,9 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
             $scope.machine = machine;
             // console.log(machine.flavor)
             $scope.axioms = axioms;
+            Image.getImages(function(response){
+                $scope.images = Image.getData().images;
+            });
             $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
         });
         // Try to stop or start a machine
diff --git a/client/js/services/Image.js b/client/js/services/Image.js
index 9947869..4866944 100644
--- a/client/js/services/Image.js
+++ b/client/js/services/Image.js
@@ -26,6 +26,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
                 requestParserResult.status = 0;
                 data.images = response.data.Images;
 
+
             } else if (failedToSendRequest) {
                 requestParserResult.failReason = "Failed to send request";
             } else {
@@ -131,8 +132,8 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
             });
         };
 
-        var createImage = function (name,callback) {
-        
+        var createImage = function (name, callback) {
+
 
             var result = $http.post('../server/index.php',
                     $.param({"token": Identity.getToken(), "task": "image", 'action': 'createImage', "opt": {"name": name}}));
@@ -148,11 +149,11 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
                 callback()
             });
         };
-        var deleteImage = function (id,callback) {
-        
+        var deleteImage = function (id, callback) {
+
 
             var result = $http.post('../server/index.php',
-                    $.param({"token": Identity.getToken(), "task": "image", 'action': 'deleteImage', "id":id}));
+                    $.param({"token": Identity.getToken(), "task": "image", 'action': 'deleteImage', "id": id}));
 
             //var result=$http.post('../server/index.php',
             //				  $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, 'id':'6564'}));  
@@ -177,7 +178,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
             getImages: getImages,
             updateImage: updateImage,
             getData: getData,
-            deleteImage:deleteImage,
+            deleteImage: deleteImage,
             createImage: createImage,
             uploadImage: uploadImage
         };
diff --git a/client/partials/home/machineDetails.html b/client/partials/home/machineDetails.html
index 4fc3f32..83701e7 100644
--- a/client/partials/home/machineDetails.html
+++ b/client/partials/home/machineDetails.html
@@ -49,7 +49,7 @@
                     <fieldset class="form-group">
                         <label class="control-label col-sm-2">Image</label>
                         <select class="col-sm-20" id="ramSelected">
-                            <option ng-repeat="image in axioms.images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name}}</option>
+                            <option ng-repeat="image in images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name}}</option>
                         </select>
                     </fieldset>