From 07cb63b82e811de58592dd10fa711230e553eb9b Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Thu, 4 Nov 2010 10:34:16 -0700
Subject: [PATCH] new UI - allow update isPublic field of ISO.

---
 ui/jsp/iso.jsp               |  6 ++----
 ui/scripts/cloud.core.iso.js | 29 +++++++++++++++++++++++------
 2 files changed, 25 insertions(+), 10 deletions(-)

diff --git a/ui/jsp/iso.jsp b/ui/jsp/iso.jsp
index 012a0160500..f699f8975b4 100644
--- a/ui/jsp/iso.jsp
+++ b/ui/jsp/iso.jsp
@@ -135,13 +135,11 @@
 	                </div>
 	                <div class="grid_row_cell" style="width: 79%;">
 	                    <div class="row_celltitles" id="ispublic">                       
-	                    </div>
-	                    <!--  
+	                    </div>	                
 	                    <select class="select" id="ispublic_edit" style="width: 202px; display: none;">
 	                        <option value="true">Yes</option>
 							<option value="false">No</option>
-	                    </select>
-	                    -->
+	                    </select>	                 
 	                </div>
 	            </div>	 
 	            <div class="grid_rows odd">
diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 77b9befbff5..9fc27363b4f 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -249,7 +249,7 @@ function isoJsonToDetailsTab() {
     setBooleanReadField(jsonObj.bootable, $thisTab.find("#bootable"));	
     
     setBooleanReadField(jsonObj.ispublic, $thisTab.find("#ispublic"));	
-    //setBooleanEditField(jsonObj.ispublic, $thisTab.find("#ispublic_edit"));
+    setBooleanEditField(jsonObj.ispublic, $thisTab.find("#ispublic_edit"));
     
     setBooleanReadField(jsonObj.crossZones, $thisTab.find("#crossZones"));	     
     setDateField(jsonObj.created, $thisTab.find("#created"));	  
@@ -354,8 +354,8 @@ var isoActionMap = {
 
 function doEditISO($actionLink, $detailsTab, $midmenuItem1) {   
     //var $detailsTab = $("#right_panel_content #tab_content_details");  
-    var $readonlyFields  = $detailsTab.find("#name, #displaytext");
-    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit"); 
+    var $readonlyFields  = $detailsTab.find("#name, #displaytext, #ispublic");
+    var $editFields = $detailsTab.find("#name_edit, #displaytext_edit, #ispublic_edit"); 
            
     $readonlyFields.hide();
     $editFields.show();  
@@ -395,18 +395,35 @@ function doEditISO2($actionLink, $detailsTab, $midmenuItem1) {
 	
 	var displaytext = $detailsTab.find("#displaytext_edit").val();
 	array1.push("&displayText="+todb(displaytext));
-	
-	//var isPublic = $detailsTab.find("#public_edit").val();	//???   
-	
+		
 	$.ajax({
 	    data: createURL("command=updateIso"+array1.join("")),
 		dataType: "json",
+		async: false,
 		success: function(json) {	
 		    var jsonObj = json.updateisoresponse;		    
 		    isoToMidmenu(jsonObj, $midmenuItem1); 
             isoJsonToDetailsTab($midmenuItem1);	    					
 		}
 	});
+	
+	//updateIsoPermissions
+	var array2 = [];	
+	var oldIsPublic = jsonObj.ispublic.toString();	
+	var newIsPublic = $detailsTab.find("#ispublic_edit").val();       
+	if(newIsPublic != oldIsPublic)
+	    array2.push("&ispublic="+newIsPublic);	    						
+								
+	if(array2.length > 0) {	
+	    $.ajax({
+		    data: createURL("command=updateIsoPermissions&id="+id+array2.join("")),
+		    dataType: "json",
+		    async: false,
+		    success: function(json) {			    	        						       					    
+		        //no embedded object is returned. (API needs to be fixed)		
+    		}
+	    });
+	}	
 }
 
 function doDeleteIso($actionLink, $detailsTab, $midmenuItem1) {