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-06 14:39:30 +02:00
parent 21ed091ba6
commit f9eb9712b3
2 changed files with 5 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
client/js/controllers/home/machineCreation.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('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', function ($scope, Compute, $rootScope, $timeout, Identity) mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$timeout', 'Identity', 'Image', function ($scope, Compute, $rootScope, $timeout, Identity, Image)
{ {
$scope.name = ""; $scope.name = "";
@ -11,6 +11,9 @@ mainApp.controller('machineCreationCtrl', ['$scope', 'Compute', '$rootScope', '$
// 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;
Image.getImages(function(response){
$scope.images = Image.getData().images;
});
$('#machineCreationModal').modal({backdrop: false, keyboard: true}); $('#machineCreationModal').modal({backdrop: false, keyboard: true});
}); });

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

@ -25,7 +25,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" ng-model="selectedImage"> <select class="col-sm-20" id="ramSelected" ng-model="selectedImage">
<option ng-repeat="image in axioms.images" value="{{image.id}}">{{ image.name}}</option> <option ng-repeat="image in images" value="{{image.id}}">{{ image.name}}</option>
</select> </select>
</fieldset> </fieldset>
</form> </form>