apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-11-03 04:12:31 +01:00
Code Issues Packages Projects Releases Wiki Activity

bug 10790: cloudStack - volume page - Hide Storage for normal user. Show storage for root admin and domain admin.

Browse Source
This commit is contained in:
Jessica Wang 2011-07-22 10:24:18 -07:00
parent 2ee7d34c10
commit 9791cddccc
2 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
ui/jsp/volume.jsp
View File

@ -169,18 +169,8 @@ dictionary = {
<div class="row_celltitles" id="created"> <div class="row_celltitles" id="created">
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.storage"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="storage">
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
<fmt:message key="label.account"/>:</div> <fmt:message key="label.account"/>:</div>
@ -190,7 +180,7 @@ dictionary = {
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even"> <div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;"> <div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles"> <div class="row_celltitles">
<fmt:message key="label.domain"/>:</div> <fmt:message key="label.domain"/>:</div>
@ -199,7 +189,19 @@ dictionary = {
<div class="row_celltitles" id="domain"> <div class="row_celltitles" id="domain">
</div> </div>
</div> </div>
</div> </div>
<div class="grid_rows even" id="storage_container" style="display:none">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.storage"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="storage">
</div>
</div>
</div>
</div> </div>
</div> </div>
</div> </div>

15
ui/scripts/cloud.core.volume.js
View File

@ -422,8 +422,7 @@ function volumeJsonToDetailsTab(){
$thisTab.find("#name").text(fromdb(jsonObj.name)); $thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#zonename").text(fromdb(jsonObj.zonename)); $thisTab.find("#zonename").text(fromdb(jsonObj.zonename));
$thisTab.find("#device_id").text(fromdb(jsonObj.deviceid)); $thisTab.find("#device_id").text(fromdb(jsonObj.deviceid));
$thisTab.find("#state").text(fromdb(jsonObj.state)); $thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#storage").text(fromdb(jsonObj.storage));
$thisTab.find("#account").text(fromdb(jsonObj.account)); $thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain)); $thisTab.find("#domain").text(fromdb(jsonObj.domain));
$thisTab.find("#type").text(fromdb(jsonObj.type) + " (" + fromdb(jsonObj.storagetype) + " storage)"); $thisTab.find("#type").text(fromdb(jsonObj.type) + " (" + fromdb(jsonObj.storagetype) + " storage)");
@ -433,7 +432,17 @@ function volumeJsonToDetailsTab(){
else else
$thisTab.find("#vm_name").text(getVmName(jsonObj.vmname, jsonObj.vmdisplayname) + " (" + fromdb(jsonObj.vmstate) + ")"); $thisTab.find("#vm_name").text(getVmName(jsonObj.vmname, jsonObj.vmdisplayname) + " (" + fromdb(jsonObj.vmstate) + ")");
setDateField(jsonObj.created, $thisTab.find("#created")); setDateField(jsonObj.created, $thisTab.find("#created"));
if(isAdmin() || isDomainAdmin()) {
$thisTab.find("#storage").text(fromdb(jsonObj.storage));
$thisTab.find("#storage_container").show();
}
else {
$thisTab.find("#storage").text("");
$thisTab.find("#storage_container").hide();
}
//actions *** //actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu"); var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty(); $actionMenu.find("#action_list").empty();