From fd374aeabd3e902b014b443be615b23acb1e471e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica.wang@citrix.com>
Date: Wed, 20 Jun 2012 16:33:52 -0700
Subject: [PATCH] bug 14760: cloudstack 2.2 UI - template page - edit template
 action - (1) not pass ispublic parameter to updateTemplatePermission API if
 ispublic field is not editable. (2) not pass isfeatured parameter to
 updateTemplatePermission API if isfeatured field is not editable.

---
 ui/scripts/cloud.core.template.js | 29 +++++++++++++++++------------
 1 file changed, 17 insertions(+), 12 deletions(-)

diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index a4f09a02522..330eed5588c 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -376,7 +376,7 @@ function templateJsonToDetailsTab() {
         dataType: "json",
         async: false,
         success: function(json) {            
-            var items = json.listtemplatesresponse.template;
+            var items = json.listtemplatesresponse.template;						
             if(items != null && items.length > 0) {
                 jsonObj = items[0];
                 $midmenuItem1.data("jsonObj", jsonObj);                  
@@ -746,17 +746,22 @@ function doEditTemplate2($actionLink, $detailsTab, $midmenuItem1, $readonlyField
 	}
 		
 	//updateTemplatePermissions	
-	var array2 = [];		
-	var oldIsPublic = jsonObj.ispublic.toString();	
-	var newIsPublic = $detailsTab.find("#ispublic_edit").val();        
-	if(newIsPublic != oldIsPublic)
-	    array2.push("&ispublic="+newIsPublic);
-	    
-	var oldIsFeatured = jsonObj.isfeatured.toString();	
-	var newIsFeatured = $detailsTab.find("#isfeatured_edit").val();           
-    if(newIsFeatured != oldIsFeatured)
-        array2.push("&isfeatured="+newIsFeatured);											
-								
+	var array2 = [];		
+	
+	if($detailsTab.find("#ispublic_edit").css("display") != "none" ) {
+		var oldIsPublic = jsonObj.ispublic.toString();	
+		var newIsPublic = $detailsTab.find("#ispublic_edit").val();        
+		if(newIsPublic != oldIsPublic)
+			array2.push("&ispublic="+newIsPublic);
+	}
+   
+	if($detailsTab.find("#isfeatured_edit").css("display") != "none" ) {
+		var oldIsFeatured = jsonObj.isfeatured.toString();	
+		var newIsFeatured = $detailsTab.find("#isfeatured_edit").val();           
+		if(newIsFeatured != oldIsFeatured)
+			array2.push("&isfeatured="+newIsFeatured);											
+	}
+	
 	if(array2.length > 0) {	
 	    $.ajax({
 		    data: createURL("command=updateTemplatePermissions&id="+id+array2.join("")),