openstack
/
horizon
Code Issues Proposed changes

Merge "Pre-populate image size on create volume from image modal"

This commit is contained in:
Jenkins 2017-04-26 15:38:40 +00:00 committed by Gerrit Code Review
parent b80668e7d4 770858e5ef
commit b48bf1ad8a
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openstack_dashboard/static/app/core/images/steps/create-volume/create-volume.controller.js
View File

@ -18,6 +18,7 @@
angular
.module('horizon.app.core.images')
.constant('BYTE_TO_GIB', 9.3132e-10)
.controller('horizon.app.core.images.steps.CreateVolumeController', CreateVolumeController);
CreateVolumeController.$inject = [
@ -25,7 +26,8 @@
'$filter',
'horizon.app.core.openstack-service-api.cinder',
'horizon.app.core.openstack-service-api.nova',
'horizon.framework.widgets.charts.quotaChartDefaults'
'horizon.framework.widgets.charts.quotaChartDefaults',
'BYTE_TO_GIB'
];
/**
@ -40,7 +42,7 @@
* This controller is use for creating an image.
* @return {undefined} No return value
*/
function CreateVolumeController($scope, $filter, cinder, nova, quotaChartDefaults) {
function CreateVolumeController($scope, $filter, cinder, nova, quotaChartDefaults, BYTE_TO_GIB) {
var ctrl = this;
ctrl.volumeType = {};
@ -58,7 +60,7 @@
// bind for local access and also hand back up to the wizard controller
// stepModels will be passed to the create volume action submit()
$scope.stepModels.volumeForm = ctrl.volume = {
size: 1,
size: Math.ceil(Math.max(ctrl.image.min_disk, ctrl.image.size * BYTE_TO_GIB)) || 1,
name: ctrl.image.name,
description: '',
volume_type: '',
@ -70,7 +72,7 @@
};
ctrl.storageQuota = {
title: gettext('Volume and Snapshot Quota (GB)'),
title: gettext('Volume and Snapshot Quota (GiB)'),
maxLimit: ctrl.maxTotalVolumeGigabytes,
label: getPercentUsed(ctrl.volume.size, ctrl.maxTotalVolumeGigabytes),
data: [

2
openstack_dashboard/static/app/core/images/steps/create-volume/create-volume.controller.spec.js
View File

@ -137,7 +137,7 @@
var ctrl = createController();
var graph = ctrl.storageQuota;
expect(graph.title).toEqual('Volume and Snapshot Quota (GB)');
expect(graph.title).toEqual('Volume and Snapshot Quota (GiB)');
expect(graph.maxLimit).toEqual(2);
expect(graph.label).toEqual('100%');

2
openstack_dashboard/static/app/core/images/steps/create-volume/create-volume.html
View File

@ -37,7 +37,7 @@
<div class="col-xs-6">
<div class="form-group">
<label for="volume-size" class="control-label">
<span translate>Size (GB)</span>
<span translate>Size (GiB)</span>
<span class="hz-icon-required fa fa-asterisk"></span>
</label>
<input name="volume-size" class="form-control" id="volume-size" type="number" min="1" ng-required="true" ng-model="createVolumeCtrl.volume.size">