etan39
/
cloudstack
mirror of https://github.com/apache/cloudstack.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Jessica Wang 2010-11-08 19:41:06 -08:00
parent dccec784fc
commit 9bd7344fae
2 changed files with 8 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ui/scripts/cloud.core.iso.js
View File

@ -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);

26
ui/scripts/cloud.core.template.js
View File

@ -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));