From 9bd7344fae84cc897fbee6f03c307291c7dcaf2e Mon Sep 17 00:00:00 2001
From: Jessica Wang <jessica@cloud.com>
Date: Mon, 8 Nov 2010 19:41:06 -0800
Subject: [PATCH] new UI - template page - fix a bug "id is not found" after
 creating a template for all zones and click one of them in middle menu.

---
 ui/scripts/cloud.core.iso.js      | 31 +++----------------------------
 ui/scripts/cloud.core.template.js | 26 +++++---------------------
 2 files changed, 8 insertions(+), 49 deletions(-)

diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js
index 985e224240c..1c1e6e54602 100644
--- a/ui/scripts/cloud.core.iso.js
+++ b/ui/scripts/cloud.core.iso.js
@@ -194,34 +194,9 @@ function isoJsonToDetailsTab() {
     $thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();        
     
-    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    
-    
-    var jsonObj = $midmenuItem1.data("jsonObj");
-    
-    //listIsos API has a bug => it returns nothing when id is 200(xs-tools.iso) and zoneid is specified. So, comment the following code before the bug is fixed.
-    /*
-    var array1 = [];
-    var id = $midmenuItem1.data("jsonObj").id;
-    array1.push("&id="+id);
-    
-    var zoneid = $midmenuItem1.data("jsonObj").zoneid;
-    if(zoneid != null)
-        array1.push("&zoneid="+zoneid);
-        
-    var jsonObj;     
-    $.ajax({
-        data: createURL("command=listIsos&isofilter=self"+array1.join("")),
-        dataType: "json",
-        async: false,
-        success: function(json) {            
-            var items = json.listisosresponse.iso;  
-            if(items != null && items.length > 0)
-                jsonObj = items[0];
-        }
-    });   
-    */   
-    
+    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");  
+    var jsonObj = $midmenuItem1.data("jsonObj");    
+   
     $thisTab.data("jsonObj", jsonObj);    
     $midmenuItem1.data("jsonObj", jsonObj);   
     
diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js
index d3a6814e0b3..962709d04c1 100644
--- a/ui/scripts/cloud.core.template.js
+++ b/ui/scripts/cloud.core.template.js
@@ -218,21 +218,8 @@ function templateJsonToDetailsTab() {
     $thisTab.find("#tab_container").hide(); 
     $thisTab.find("#tab_spinning_wheel").show();        
     
-    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");
-    var id = $midmenuItem1.data("jsonObj").id;
-    var zoneid = $midmenuItem1.data("jsonObj").zoneid;
-        
-    var jsonObj;   
-    $.ajax({
-        data: createURL("command=listTemplates&templatefilter=self&id="+id+"&zoneid="+zoneid),
-        dataType: "json",
-        async: false,
-        success: function(json) {             
-            var items = json.listtemplatesresponse.template;            
-            if(items != null && items.length > 0)
-                jsonObj = items[0];
-        }
-    });      
+    var $midmenuItem1 = $("#right_panel_content").data("$midmenuItem1");    
+    var jsonObj = $midmenuItem1.data("jsonObj");   
     
     $thisTab.data("jsonObj", jsonObj);    
     $midmenuItem1.data("jsonObj", jsonObj);    
@@ -258,16 +245,13 @@ function templateJsonToDetailsTab() {
     
     setBooleanReadField(jsonObj.passwordenabled, $thisTab.find("#passwordenabled"));	
     setBooleanEditField(jsonObj.passwordenabled, $thisTab.find("#passwordenabled_edit"));
-    //$thisTab.find("#passwordenabled_edit").val(jsonObj.passwordenabled);
-    
+      
     setBooleanReadField(jsonObj.ispublic, $thisTab.find("#ispublic"));	
     setBooleanEditField(jsonObj.ispublic, $thisTab.find("#ispublic_edit"));
-    //$thisTab.find("#ispublic_edit").val(jsonObj.ispublic);
-    
+      
     setBooleanReadField(jsonObj.isfeatured, $thisTab.find("#isfeatured"));
     setBooleanEditField(jsonObj.isfeatured, $thisTab.find("#isfeatured_edit"));
-    //$thisTab.find("#isfeatured_edit").val(jsonObj.isfeatured);
-    
+        
     setBooleanReadField(jsonObj.crossZones, $thisTab.find("#crossZones"));
     
     $thisTab.find("#ostypename").text(fromdb(jsonObj.ostypename));