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

24
ui/jsp/volume.jsp
View File

@ -171,16 +171,6 @@ dictionary = {
</div>
</div>
<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="row_celltitles">
<fmt:message key="label.account"/>:</div>
@ -190,7 +180,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.domain"/>:</div>
@ -200,6 +190,18 @@ dictionary = {
</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>

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

@ -423,7 +423,6 @@ function volumeJsonToDetailsTab(){
$thisTab.find("#zonename").text(fromdb(jsonObj.zonename));
$thisTab.find("#device_id").text(fromdb(jsonObj.deviceid));
$thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#storage").text(fromdb(jsonObj.storage));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));
$thisTab.find("#type").text(fromdb(jsonObj.type) + " (" + fromdb(jsonObj.storagetype) + " storage)");
@ -434,6 +433,16 @@ function volumeJsonToDetailsTab(){
$thisTab.find("#vm_name").text(getVmName(jsonObj.vmname, jsonObj.vmdisplayname) + " (" + fromdb(jsonObj.vmstate) + ")");
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 ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();