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

new UI - disk offering page - fix a bug that disk size is displayed in wrong unit.

This commit is contained in:
Jessica Wang 2010-11-04 14:37:08 -07:00
parent 9a3d5c3ae3
commit daef9b076d
1 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
ui/scripts/cloud.core.diskoffering.js
View File

@ -157,7 +157,9 @@ function diskOfferingToMidmenu(jsonObj, $midmenuItem1) {
$iconContainer.find("#icon").attr("src", "images/midmenuicon_system_diskoffering.png");
$midmenuItem1.find("#first_row").text(fromdb(jsonObj.name).substring(0,25));
$midmenuItem1.find("#second_row").text(convertBytes(jsonObj.disksize));
var diskSize = diskofferingGetDiskSize(jsonObj);
$midmenuItem1.find("#second_row").text(diskSize);
}
function diskOfferingToRightPanel($midmenuItem1) {
@ -197,13 +199,9 @@ function diskOfferingJsonToDetailsTab() {
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
var diskSize;
if(jsonObj.disksize == 0 && jsonObj.isCustomized == true)
diskSize = "will be specified during VM creation";
else
diskSize = convertBytes(jsonObj.disksize);
var diskSize = diskofferingGetDiskSize(jsonObj);
$thisTab.find("#disksize").text(diskSize);
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
@ -217,6 +215,15 @@ function diskOfferingJsonToDetailsTab() {
$thisTab.find("#tab_container").show();
}
function diskofferingGetDiskSize(jsonObj) {
var diskSize;
if(jsonObj.disksize == 0 && jsonObj.isCustomized == true)
diskSize = "specify disk size during VM creation";
else
diskSize = convertBytes(jsonObj.disksize * 1024 * 1024); //unit of jsonObj.disksize is MB.
return diskSize;
}
function diskOfferingClearRightPanel() {
diskOfferingClearDetailsTab();
}