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

new UI - VM wizard - fix a bug that customized disk size didn't show in last step if blank template (ISO) is selected.

This commit is contained in:
Jessica Wang 2010-11-04 15:00:58 -07:00
parent 8dbd701b13
commit 01f19ea995
1 changed files with 18 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
ui/scripts/cloud.core.instance.js
View File

@ -772,43 +772,28 @@ function initVMWizard() {
if(currentStepInVmPopup ==3) { //disk offering
if($selectedVmWizardTemplate.data("templateType") == "template") { //*** template ***
var checkedRadioButton = $thisPopup.find("#data_disk_offering_container input[name=data_disk_offering_radio]:checked");
var $diskOfferingElement = checkedRadioButton.parent();
// validate values
var isValid = true;
if($diskOfferingElement.find("#custom_disk_size").length > 0)
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, false); //required
else
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, true); //optional
if (!isValid)
return;
$thisPopup.find("#wizard_review_disk_offering_label").text("Data Disk Offering:");
var diskOfferingName = $diskOfferingElement.find("#name").text();
if(checkedRadioButton.parent().attr("id") == "vm_popup_disk_offering_template_custom")
diskOfferingName += (" (Disk Size: " + $diskOfferingElement.find("#custom_disk_size").val() + " MB)");
$thisPopup.find("#wizard_review_disk_offering").text(diskOfferingName);
$thisPopup.find("#wizard_review_disk_offering_label").text("Data Disk Offering:");
var checkedRadioButton = $thisPopup.find("#data_disk_offering_container input[name=data_disk_offering_radio]:checked");
}
else { //*** ISO ***
var checkedRadioButton = $thisPopup.find("#root_disk_offering_container input[name=root_disk_offering_radio]:checked");
var $diskOfferingElement = checkedRadioButton.parent();
// validate values
var isValid = true;
if($diskOfferingElement.find("#custom_disk_size").length > 0)
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, false); //required
else
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, true); //optional
if (!isValid)
return;
$thisPopup.find("#wizard_review_disk_offering_label").text("Root Disk Offering:");
var diskOfferingName = $diskOfferingElement.find("#name").text();
$thisPopup.find("#wizard_review_disk_offering").text(diskOfferingName);
var checkedRadioButton = $thisPopup.find("#root_disk_offering_container input[name=root_disk_offering_radio]:checked");
}
var $diskOfferingElement = checkedRadioButton.parent();
var isValid = true;
if($diskOfferingElement.find("#custom_disk_size").length > 0)
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, false); //required
else
isValid &= validateNumber("Disk Size", $diskOfferingElement.find("#custom_disk_size"), $diskOfferingElement.find("#custom_disk_size_errormsg"), null, null, true); //optional
if (!isValid)
return;
var diskOfferingName = $diskOfferingElement.find("#name").text();
if(checkedRadioButton.parent().attr("id") == "vm_popup_disk_offering_template_custom")
diskOfferingName += (" (Disk Size: " + $diskOfferingElement.find("#custom_disk_size").val() + " MB)");
$thisPopup.find("#wizard_review_disk_offering").text(diskOfferingName);
}
if (currentStepInVmPopup == 4) { //network