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

bug 11725: cloudStack 2.2 UI - volume page - hide Take Snapshot, Recurring Snapshot action when volume's hypervisor is Ovm.

This commit is contained in:
Jessica Wang 2011-10-14 17:20:19 -07:00
parent faa3622187
commit dd9c548eb6
2 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/scripts/cloud.core.instance.js
View File

@ -2394,23 +2394,15 @@ function vmVolumeJSONToTemplate(json, $template) {
//***** actions (begin) *****
var $actionLink = $template.find("#action_link");
bindActionLink($actionLink);
/*
$actionLink.unbind("mouseover").bind("mouseover", function(event) {
$(this).find("#action_menu").show();
return false;
});
$actionLink.unbind("mouseout").bind("mouseout", function(event) {
$(this).find("#action_menu").hide();
return false;
});
*/
var $actionMenu = $actionLink.find("#action_menu");
$actionMenu.find("#action_list").empty();
var noAvailableActions = true;
buildActionLinkForSubgridItem("label.action.take.snapshot", vmVolumeActionMap, $actionMenu, $template);
noAvailableActions = false;
if(json.hypervisor != "Ovm") {
buildActionLinkForSubgridItem("label.action.take.snapshot", vmVolumeActionMap, $actionMenu, $template);
noAvailableActions = false;
}
if(json.type=="ROOT") { //"label.action.create.template" is allowed(when stopped), "label.action.detach.disk" is disallowed.
if (json.vmstate == "Stopped") {

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

@ -446,9 +446,11 @@ function volumeJsonToDetailsTab(){
//actions ***
var $actionMenu = $("#right_panel_content #tab_content_details #action_link #action_menu");
$actionMenu.find("#action_list").empty();
buildActionLinkForTab("label.action.take.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show take snapshot
buildActionLinkForTab("label.action.recurring.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show Recurring Snapshot
if(jsonObj.hypervisor != "Ovm") {
buildActionLinkForTab("label.action.take.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show take snapshot
buildActionLinkForTab("label.action.recurring.snapshot", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab); //show Recurring Snapshot
}
if(jsonObj.state != "Allocated")
buildActionLinkForTab("label.action.download.volume", volumeActionMap, $actionMenu, $midmenuItem1, $thisTab);