From 08abc5970db3669e57f92dd4643a479f516dbdfa Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Fri, 14 Jan 2011 14:10:26 -0800
Subject: [PATCH] ISO page - make Delete ISO available as long as the ISO is
 not in downloaded status.

---
 ui/scripts/cloud.core.iso.js | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index e1ee5510788..9ac561eb40e 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -337,16 +337,24 @@ function isoJsonToDetailsTab() {
     }
 	*/
     
-	// "Download ISO", "Delete ISO"
+	// "Download ISO"
 	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false)) {
 	    //do nothing
 	}
 	else {	    
-	    buildActionLinkForTab("Download ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
-	    buildActionLinkForTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
+	    buildActionLinkForTab("Download ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);		    
 	    noAvailableActions = false;
 	}    		   
 	
+	// "Delete ISO"
+	if (((isUser() && jsonObj.ispublic == true && !(jsonObj.domainid == g_domainid && jsonObj.account == g_account))) || (jsonObj.isready == false && jsonObj.status != null && jsonObj.status.indexOf("Downloaded") != -1)) {
+	    //do nothing
+	}
+	else {	   	    
+	    buildActionLinkForTab("Delete ISO", isoActionMap, $actionMenu, $midmenuItem1, $thisTab);	
+	    noAvailableActions = false;
+	}    	
+	
 	// no available actions 
 	if(noAvailableActions == true) {
 	    $actionMenu.find("#action_list").append($("#no_available_actions").clone().show());