diff --git a/ui/scripts/cloud.core.iso.js b/ui/scripts/cloud.core.iso.js index a028d6059fc..b8d991780f6 100644 --- a/ui/scripts/cloud.core.iso.js +++ b/ui/scripts/cloud.core.iso.js @@ -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(""); $.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 = ""; @@ -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(""); } @@ -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.data("jsonObj", items[i]); diff --git a/ui/scripts/cloud.core.template.js b/ui/scripts/cloud.core.template.js index 6546c3f078a..ea732fc4baf 100644 --- a/ui/scripts/cloud.core.template.js +++ b/ui/scripts/cloud.core.template.js @@ -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(""); $.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(""); } @@ -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(""); for(var i = 0; i < items.length; i++) { var $option = $("");