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

new UI: fix a javascript error that happened after clicking between My Template and Featured Template => 'events' is null or not an object

This commit is contained in:
Jessica Wang 2010-11-12 19:10:07 -08:00
parent 215924f706
commit eb3ae6c27f
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -99,11 +99,11 @@ function afterLoadIsoJSP() {
});
//populate dropdown ***
var addIsoZoneField = $("#dialog_add_iso #add_iso_zone");
var addIsoZoneField = $("#dialog_add_iso").find("#add_iso_zone");
if (isAdmin())
addIsoZoneField.append("<option value='-1'>All Zones</option>");
$.ajax({
data: createURL("command=listZones&available=true"+maxPageSize),
data: createURL("command=listZones&available=true"),
dataType: "json",
success: function(json) {
var zones = json.listzonesresponse.zone;
@ -118,12 +118,12 @@ function afterLoadIsoJSP() {
});
$.ajax({
data: createURL("command=listOsTypes&response=json"+maxPageSize),
data: createURL("command=listOsTypes"),
dataType: "json",
success: function(json) {
types = json.listostypesresponse.ostype;
if (types != null && types.length > 0) {
var osTypeDropDownAdd = $("#dialog_add_iso #add_iso_os_type").empty();
var osTypeDropDownAdd = $("#dialog_add_iso").find("#add_iso_os_type").empty();
var osTypeDropdownEdit = $detailsTab.find("#ostypename_edit").empty();
for (var i = 0; i < types.length; i++) {
var html = "<option value='" + types[i].id + "'>" + fromdb(types[i].description) + "</option>";
@ -135,12 +135,12 @@ function afterLoadIsoJSP() {
});
$.ajax({
data: createURL("command=listServiceOfferings&response=json"+maxPageSize),
data: createURL("command=listServiceOfferings"),
dataType: "json",
success: function(json) {
var items = json.listserviceofferingsresponse.serviceoffering;
if(items != null && items.length > 0 ) {
var serviceOfferingField = $("#dialog_create_vm_from_iso #service_offering").empty();
var serviceOfferingField = $("#dialog_create_vm_from_iso").find("#service_offering").empty();
for(var i = 0; i < items.length; i++)
serviceOfferingField.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
}
@ -148,12 +148,12 @@ function afterLoadIsoJSP() {
});
$.ajax({
data: createURL("command=listDiskOfferings&response=json"+maxPageSize),
data: createURL("command=listDiskOfferings"),
dataType: "json",
success: function(json) {
var items = json.listdiskofferingsresponse.diskoffering;
if(items != null && items.length > 0 ) {
var diskOfferingField = $("#dialog_create_vm_from_iso #disk_offering").empty();
var diskOfferingField = $("#dialog_create_vm_from_iso").find("#disk_offering").empty();
for(var i = 0; i < items.length; i++) {
var $option = $("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
$option.data("jsonObj", items[i]);

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

@ -120,7 +120,7 @@ function afterLoadTemplateJSP() {
});
//populate dropdown ***
var addTemplateZoneField = $("#dialog_add_template #add_template_zone");
var addTemplateZoneField = $("#dialog_add_template").find("#add_template_zone");
if (isAdmin())
addTemplateZoneField.append("<option value='-1'>All Zones</option>");
$.ajax({
@ -144,7 +144,7 @@ function afterLoadTemplateJSP() {
success: function(json) {
types = json.listostypesresponse.ostype;
if (types != null && types.length > 0) {
var osTypeDropdownAdd = $("#dialog_add_template #add_template_os_type");
var osTypeDropdownAdd = $("#dialog_add_template").find("#add_template_os_type");
var osTypeDropdownEdit = $detailsTab.find("#ostypename_edit").empty();
if(types != null && types.length > 0) {
for(var i = 0; i < types.length; i++) {
@ -163,7 +163,7 @@ function afterLoadTemplateJSP() {
success: function(json) {
var items = json.listserviceofferingsresponse.serviceoffering;
if(items != null && items.length > 0 ) {
var serviceOfferingField = $("#dialog_create_vm_from_template #service_offering").empty();
var serviceOfferingField = $("#dialog_create_vm_from_template").find("#service_offering").empty();
for(var i = 0; i < items.length; i++)
serviceOfferingField.append("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");
}
@ -176,7 +176,7 @@ function afterLoadTemplateJSP() {
success: function(json) {
var items = json.listdiskofferingsresponse.diskoffering;
if(items != null && items.length > 0 ) {
var diskOfferingField = $("#dialog_create_vm_from_template #disk_offering").empty();
var diskOfferingField = $("#dialog_create_vm_from_template").find("#disk_offering").empty();
diskOfferingField.append("<option value=''>No disk offering</option>");
for(var i = 0; i < items.length; i++) {
var $option = $("<option value='" + items[i].id + "'>" + fromdb(items[i].name) + "</option>");