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

Correct bug

Browse source
This commit is contained in:
Loic GUEGAN 2016-05-04 22:46:40 +02:00
parent cddd9682e6
commit a9e8c8e664
4 changed files with 35 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
client/js/controllers/home/machineCreation.js
View file

@ -6,20 +6,35 @@
mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity) mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity)
{ {
$scope.name = "";
$scope.name = "loic" $('#pleaseChooseAnImage').hide();
// When we need to show details of machine // When we need to show details of machine
$scope.$on('showMachineCreationEvent', function (eventName, axioms) { $scope.$on('showMachineCreationEvent', function (eventName, axioms) {
$scope.axioms=axioms; $scope.axioms = axioms;
$('#machineCreationModal').modal({backdrop: false, keyboard: true}); $('#machineCreationModal').modal({backdrop: false, keyboard: true});
}); });
$scope.createMachine=function(){ var callMeAfterMachineCreation=function(response){
machine={} Compute.pullData(function(){});
machine.name="loicTest" };
machine.flavorId=1
machine.imageId="fd1ea580-a83e-4dc8-833c-96ce2b6f1358" $scope.createMachine = function () {
Compute.createMachine(function(){console.log("done")}, machine) 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="";
}
}; };
}]); }]);

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

@ -42,7 +42,7 @@ mainApp.controller('machineDetailsCtrl', ['$scope', 'Compute', '$rootScope', '$t
}; };
$scope.deleteMachine=function(){ $scope.deleteMachine=function(){
Compute.deleteMachine(function(){console.log("deleted")},$scope.machine.id); Compute.deleteMachine(function(){Compute.pullData(function(){});},$scope.machine.id);
} }
}]); }]);

5
client/js/services/Compute.js
View file

@ -112,8 +112,9 @@ mainApp.factory('Compute', ['$http', 'Identity', function ($http, Identity) {
// Wait and handle the response // Wait and handle the response
result.then(function (response) { result.then(function (response) {
callback(); console.log(response.data)
console.log(response.data.Error) callback();
}, function (response) { }, function (response) {
console.log("error") console.log("error")
callback(); callback();

23
client/partials/home/machineCreation.html
View file

@ -15,29 +15,17 @@
<div class="form-group"> <div class="form-group">
<label class="control-label col-sm-2">Name</label> <label class="control-label col-sm-2">Name</label>
<div class="col-sm-20"> <div class="col-sm-20">
<input type="text" value="" /> <input type="text" value="" ng-model="name"/>
</div> </div>
</div> </div>
<fieldset class="form-group">
<label class="control-label col-sm-2">RAM</label>
<select class="col-sm-20" id="ramSelected">
<option ng-repeat="ram in axioms.ram" ng-selected="machine.ram == ram">{{ ram}}</option>
</select>
<span>MB</span>
</fieldset>
<fieldset class="form-group">
<label class="control-label col-sm-2">Disk</label>
<select class="col-sm-20" id="ramSelected">
<option ng-repeat="disk in axioms.disk" ng-selected="machine.disk == disk">{{ disk}}</option>
</select>
</fieldset>
<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" ng-model="selectedImage">
<option ng-repeat="image in axioms.images" ng-selected="machine.imageId == Object.keys(image)">{{ image.name}}</option> <option ng-repeat="image in axioms.images" value="{{image.id}}">{{ image.name}}</option>
</select> </select>
</fieldset> </fieldset>
</form> </form>
@ -45,7 +33,8 @@
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<a href="#" data-dismiss="modal" ng-click="createMachine()" class="btn btn-primary">Create</a> <div class="alert alert-danger text-center" role="alert" id="pleaseChooseAnImage"><b>Please choose an image !</b></div>
<a href="#" ng-click="createMachine()" class="btn btn-primary">Create</a>
<a href="#" data-dismiss="modal" class="btn btn-default">Cancel</a> <a href="#" data-dismiss="modal" class="btn btn-default">Cancel</a>
</div> </div>
</div> </div>