loic/istic-openstack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct bugs

Browse source
This commit is contained in:
Loic GUEGAN 2016-05-06 14:37:02 +02:00
parent 2856a776db
commit 21ed091ba6
3 changed files with 12 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/js/controllers/home/machineDetails.js
View file

@ -3,7 +3,7 @@
* *
* @param {$scope} $scope The $scope service from angular * @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; $scope.machine = machine;
// console.log(machine.flavor) // console.log(machine.flavor)
$scope.axioms = axioms; $scope.axioms = axioms;
Image.getImages(function(response){
$scope.images = Image.getData().images;
});
$('#machineDetailsModal').modal({backdrop: false, keyboard: true}); $('#machineDetailsModal').modal({backdrop: false, keyboard: true});
}); });
// Try to stop or start a machine // Try to stop or start a machine

9
client/js/services/Image.js
View file

@ -26,6 +26,7 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
requestParserResult.status = 0; requestParserResult.status = 0;
data.images = response.data.Images; data.images = response.data.Images;
} else if (failedToSendRequest) { } else if (failedToSendRequest) {
requestParserResult.failReason = "Failed to send request"; requestParserResult.failReason = "Failed to send request";
} else { } else {
@ -131,7 +132,7 @@ 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', var result = $http.post('../server/index.php',
@ -148,11 +149,11 @@ mainApp.factory('Image', ['$http', 'Identity', function ($http, Identity) {
callback() callback()
}); });
}; };
var deleteImage = function (id,callback) { var deleteImage = function (id, callback) {
var result = $http.post('../server/index.php', 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', //var result=$http.post('../server/index.php',
// $.param({"token" : Identity.getToken(), "task" : "image", 'action':'uploadImage', 'file_name':form_data, 'id':'6564'})); // $.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, getImages: getImages,
updateImage: updateImage, updateImage: updateImage,
getData: getData, getData: getData,
deleteImage:deleteImage, deleteImage: deleteImage,
createImage: createImage, createImage: createImage,
uploadImage: uploadImage uploadImage: uploadImage
}; };

2
client/partials/home/machineDetails.html
View file

@ -49,7 +49,7 @@
<fieldset class="form-group"> <fieldset class="form-group">
<label class="control-label col-sm-2">Image</label> <label class="control-label col-sm-2">Image</label>
<select class="col-sm-20" id="ramSelected"> <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> </select>
</fieldset> </fieldset>