etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1342 from ustcweizhou/root-disk-size-ui 

CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templatesThis commit includes three changes:
(1) Revert commit 13bf1ec5da to show the 'root disk size' field
(2) Set the default value from '1' to empty. This also changes the default value of customized service offerings from '1' to empty.
(3) show 'root disk size' field only when users choose a KVM template, as cloudstack supports deployvm with rootdisksize on KVM only.

* pr/1342:
  CLOUDSTACK-6181: Add 'root disk size' field in instance wizard for KVM templates

Signed-off-by: Remi Bergsma <github@remi.nl>
This commit is contained in:
Remi Bergsma 2016-01-28 13:30:34 +01:00
parent 451ae2bab8 3822be5a5c
commit a4ad71cc56
3 changed files with 47 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
client/WEB-INF/classes/resources/messages.properties
View File

@ -38,7 +38,7 @@ label.smb.domain=SMB Domain
label.hypervisors=Hypervisors
label.home=Home
label.sockets=CPU Sockets
label.root.disk.size=Root disk size
label.root.disk.size=Root disk size (GB)
label.s3.nfs.server=S3 NFS Server
label.s3.nfs.path=S3 NFS Path
label.delete.events=Delete events

4
ui/scripts/instanceWizard.js
View File

@ -279,10 +279,6 @@
hypervisors: hypervisorObjs
},
customHidden: function(args) {
////
return true; // Disabled -- not supported in backend right now
////
if (selectedTemplateOrIso == 'select-template') {
return false; //show Root Disk Size field
} else { //selectedTemplateOrIso == 'select-iso'

55
ui/scripts/ui-custom/instanceWizard.js
View File

@ -419,8 +419,6 @@
});
});
originalValues(formData);
var custom = args.customHidden({
context: context,
data: args.data
@ -428,13 +426,52 @@
$step.find('.custom-size-label').remove();
if (!custom) {
$step.find('.section.custom-size').show();
$step.addClass('custom-disk-size');
} else {
if (custom) {
$step.find('.section.custom-size').hide();
$step.removeClass('custom-disk-size');
}
$step.find('input[type=radio]').bind('change', function() {
var $target = $(this);
var val = $target.val();
var item = null;
if (item == null) {
item = $.grep(args.data.templates.featuredtemplates, function(elem) {
return elem.id == val;
})[0];
}
if (item == null) {
item = $.grep(args.data.templates.communitytemplates, function(elem) {
return elem.id == val;
})[0];
}
if (item == null) {
item = $.grep(args.data.templates.mytemplates, function(elem) {
return elem.id == val;
})[0];
}
if (item == null) {
item = $.grep(args.data.templates.sharedtemplates, function(elem) {
return elem.id == val;
})[0];
}
if (!item) return true;
var hypervisor = item['hypervisor'];
if (hypervisor == 'KVM') {
$step.find('.section.custom-size').show();
$step.addClass('custom-disk-size');
} else {
$step.find('.section.custom-size').hide();
$step.removeClass('custom-disk-size');
}
return true;
});
originalValues(formData);
}
}
};
@ -1271,9 +1308,9 @@
args.maxDiskOfferingSize() : 100;
// Setup tabs and slider
$wizard.find('.section.custom-size .size.min span').html(minCustomDiskSize);
$wizard.find('.section.custom-size input[type=text]').val(minCustomDiskSize);
$wizard.find('.section.custom-size .size.max span').html(maxCustomDiskSize);
$wizard.find('.section.custom-size.custom-disk-size .size.min span').html(minCustomDiskSize);
$wizard.find('.section.custom-size.custom-disk-size input[type=text]').val(minCustomDiskSize);
$wizard.find('.section.custom-size.custom-disk-size .size.max span').html(maxCustomDiskSize);
$wizard.find('.tab-view').tabs();
$wizard.find('.slider').each(function() {
var $slider = $(this);