From dd9c548eb682d2a5bc2d70581200b1cf48eddbe0 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 14 Oct 2011 17:20:19 -0700
Subject: [PATCH] bug 11725: cloudStack 2.2 UI - volume page - hide Take
 Snapshot, Recurring Snapshot action when volume's hypervisor is Ovm.

---
 ui/scripts/cloud.core.instance.js | 20 ++++++--------------
 ui/scripts/cloud.core.volume.js   |  8 +++++---
 2 files changed, 11 insertions(+), 17 deletions(-)

diff --git a/ui/scripts/cloud.core.instance.js b/ui/scripts/cloud.core.instance.js
index b83bd37a860..248386e311d 100755
--- a/ui/scripts/cloud.core.instance.js
+++ b/ui/scripts/cloud.core.instance.js
@@ -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") {
diff --git a/ui/scripts/cloud.core.volume.js b/ui/scripts/cloud.core.volume.js
index ac4924c0cbf..f6fa8757494 100644
--- a/ui/scripts/cloud.core.volume.js
+++ b/ui/scripts/cloud.core.volume.js
@@ -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);