From 291a9669e70e15cfe164d882ef9baae7a8f1cea1 Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 20 Dec 2010 14:10:43 -0800
Subject: [PATCH] bug 7535: ISO page - hide "Download ISO" option for non-admin
 user.

---
 ui/scripts/cloud.core.iso.js      | 15 +++++++--------
 ui/scripts/cloud.core.template.js | 16 +++++++++-------
 2 files changed, 16 insertions(+), 15 deletions(-)

diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 0bfd4a66f88..6c0783725e2 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -317,9 +317,9 @@ function isoJsonToDetailsTab() {
     $actionMenu.find("#action_list").empty();
     var noAvailableActions = true;
 
-    // "Edit", "Copy", "Create VM" 
+    // "Edit ISO", "Copy ISO"
 	if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == false) {		
-		//nothing happens
+		//do nothing
     }
     else {        
         buildActionLinkForTab("Edit ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
@@ -329,7 +329,7 @@ function isoJsonToDetailsTab() {
             buildActionLinkForTab("Copy ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	        
     }
 		
-	// "Create VM" 
+	// "Create VM"
 	// Commenting this out for Beta2 as it does not support the new network.
 	/*
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.isready == false) || (jsonObj.bootable == false)) {
@@ -340,16 +340,15 @@ function isoJsonToDetailsTab() {
     }
 	*/
     
-	// "Delete" 
+	// "Download ISO", "Delete ISO"
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false && jsonObj.isostatus != null && jsonObj.isostatus.indexOf("% Downloaded") != -1)) {
+	    //do nothing
 	}
 	else {	    
+	    buildActionLinkForTab("Download ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
 	    buildActionLinkForTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
 	    noAvailableActions = false;
-	}    
-	
-	buildActionLinkForTab("Download ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
-    noAvailableActions = false;	
+	}    		   
 	
 	// no available actions 
 	if(noAvailableActions == true) {
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index 0e360d854c3..6efe3e5af55 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -319,26 +319,28 @@ function templateJsonToDetailsTab() {
     $actionMenu.find("#action_list").empty();
     var noAvailableActions = true;
     
-    // action Edit, Copy, Create VM 			
+    // "Edit Template", "Copy Template", "Create VM"
 	if ((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account)) || jsonObj.templatetype == "SYSTEM" || jsonObj.isready == false) {
-		//$("#edit_button").hide();		
+	    //do nothing	
     }
     else {
         buildActionLinkForTab("Edit Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);      
-        //$("#edit_button").show();
+        
         buildActionLinkForTab("Copy Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);			
+        
         // For Beta2, this simply doesn't work without a network.
-		//buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);	        
-        buildActionLinkForTab("Download Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
+		//buildActionLinkForTab("Create VM", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);	 		       
+        
         noAvailableActions = false;		
     }
 	
-	// action Delete 			
+	// "Download Template", "Delete Template"	
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) 
 		|| (jsonObj.isready == false && jsonObj.templatestatus != null && jsonObj.templatestatus.indexOf("% Downloaded") != -1) || jsonObj.templatetype == "SYSTEM") {
-		//template.find("#template_delete_container").hide();
+	    //do nothing	
     }
     else {
+        buildActionLinkForTab("Download Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
         buildActionLinkForTab("Delete Template", templateActionMap, $actionMenu, $midmenuItem1, $thisTab);
         noAvailableActions = false;	
     }