openstack/horizon
Code Issues Proposed changes

Merge "The minimum volume size should be pre-populated"

Browse Source
This commit is contained in:
Jenkins 2016-12-12 23:38:37 +00:00 committed by Gerrit Code Review
commit 1dc560a9fd
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
horizon/static/horizon/js/horizon.forms.js
View File

@ -57,16 +57,9 @@ horizon.forms = {
$volName.val($option.data("name")); $volName.val($option.data("name"));
} }
var $volSize = $form.find('input#id_size'); var $volSize = $form.find('input#id_size');
var volSize = parseInt($volSize.val(), 10) || -1;
var dataSize = parseInt($option.data("size"), 10) || -1; var dataSize = parseInt($option.data("size"), 10) || -1;
var minDiskSize = parseInt($option.data("min_disk"), 10) || -1; var minDiskSize = parseInt($option.data("min_disk"), 10) || 1;
var defaultVolSize = dataSize; $volSize.val(Math.max(minDiskSize, dataSize));
if (minDiskSize > defaultVolSize) {
defaultVolSize = minDiskSize;
}
if (volSize < defaultVolSize) {
$volSize.val(defaultVolSize);
}
}); });
}, },