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 - show "will be specified during VM creation" on diskSize row when the disk offering is customizable.

This commit is contained in:
Jessica Wang 2010-11-04 14:21:37 -07:00
parent 3999621086
commit 0e9147a249
2 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ui/jsp/diskoffering.jsp
View File

@ -119,8 +119,7 @@
</div>
</div>
</div>
<!--
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
@ -130,9 +129,8 @@
<div class="row_celltitles" id="isCustomized">
</div>
</div>
</div>
</div>
-->
</div>
<div class="grid_botactionpanel">
<div class="gridbot_buttons" id="save_button" style="display:none;">Save</div>

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

@ -197,11 +197,14 @@ function diskOfferingJsonToDetailsTab() {
$thisTab.find("#displaytext").text(fromdb(jsonObj.displaytext));
$thisTab.find("#displaytext_edit").val(fromdb(jsonObj.displaytext));
$thisTab.find("#disksize").text(convertBytes(jsonObj.disksize));
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
setBooleanReadField(jsonObj.isCustomized, $thisTab.find("#isCustomized"));
var diskSize;
if(jsonObj.disksize == 0 && jsonObj.isCustomized == true)
diskSize = "will be specified during VM creation";
else
diskSize = convertBytes(jsonObj.disksize);
$thisTab.find("#disksize").text(diskSize);
$thisTab.find("#tags").text(fromdb(jsonObj.tags));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
//actions ***