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

bug 10335: cloudStack UI - volume page - snapshot tab - hide Create Volume, Create Template action when snapshot state is not Backedup.

This commit is contained in:
Jessica Wang 2011-06-16 16:42:32 -07:00
parent 8b514c79a5
commit 45fcbd74d5
3 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
ui/jsp/volume.jsp
View File

@ -666,8 +666,18 @@ dictionary = {
<div class="row_celltitles" id="volumename">
</div>
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.state"/>:</div>
</div>
<div class="grid_row_cell" style="width: 79%;">
<div class="row_celltitles" id="state">
</div>
</div>
</div>
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.interval.type"/>:</div>
@ -677,7 +687,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.created"/>:</div>
@ -687,7 +697,7 @@ dictionary = {
</div>
</div>
</div>
<div class="grid_rows odd">
<div class="grid_rows even">
<div class="grid_row_cell" style="width: 20%;">
<div class="row_celltitles">
<fmt:message key="label.account"/>:</div>
@ -697,7 +707,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>

6
ui/scripts/cloud.core.snapshot.js
View File

@ -168,9 +168,9 @@ function snapshotJsonToDetailsTab() {
});
$thisTab.find("#id").text(fromdb(jsonObj.id));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
$thisTab.find("#name").text(fromdb(jsonObj.name));
$thisTab.find("#volume_name").text(fromdb(jsonObj.volumename));
$thisTab.find("#state").text(fromdb(jsonObj.state));
$thisTab.find("#interval_type").text(fromdb(jsonObj.intervaltype));
$thisTab.find("#account").text(fromdb(jsonObj.account));
$thisTab.find("#domain").text(fromdb(jsonObj.domain));

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

@ -518,7 +518,8 @@ function volumeSnapshotJSONToTemplate(jsonObj, template) {
template.find("#grid_header_title").text(fromdb(jsonObj.name));
template.find("#id").text(fromdb(jsonObj.id));
template.find("#name").text(fromdb(jsonObj.name));
template.find("#volumename").text(fromdb(jsonObj.volumename));
template.find("#volumename").text(fromdb(jsonObj.volumename));
template.find("#state").text(fromdb(jsonObj.state));
template.find("#intervaltype").text(fromdb(jsonObj.intervaltype));
template.find("#account").text(fromdb(jsonObj.account));
template.find("#domain").text(fromdb(jsonObj.domain));
@ -526,23 +527,15 @@ function volumeSnapshotJSONToTemplate(jsonObj, template) {
var $actionLink = template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
});
$actionLink.bind("mouseout", function(event) {
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForSubgridItem("label.action.create.volume", volumeSnapshotActionMap, $actionMenu, template);
if(jsonObj.state == "BackedUp") {
buildActionLinkForSubgridItem("label.action.create.volume", volumeSnapshotActionMap, $actionMenu, template);
buildActionLinkForSubgridItem("label.action.create.template", volumeSnapshotActionMap, $actionMenu, template);
}
buildActionLinkForSubgridItem("label.action.delete.snapshot", volumeSnapshotActionMap, $actionMenu, template);
buildActionLinkForSubgridItem("label.action.create.template", volumeSnapshotActionMap, $actionMenu, template);
}
function volumeClearRightPanel() {