From 0547b890d48c47fc86fb8155bdb3f243bb7ba577 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 14 Dec 2010 10:11:54 -0800 Subject: [PATCH] 2.1 old UI - fix error "page needs to be specified when pagesize is specified". --- ui/2.1/scripts/cloud.core.configuration.js | 6 +++--- ui/2.1/scripts/cloud.core.domains.js | 10 +++++----- ui/2.1/scripts/cloud.core.hosts.js | 14 +++++++------- ui/2.1/scripts/cloud.core.init.js | 4 +--- ui/2.1/scripts/cloud.core.instances.js | 13 +++++++------ ui/2.1/scripts/cloud.core.js | 11 ++++------- ui/2.1/scripts/cloud.core.network.js | 8 ++++---- ui/2.1/scripts/cloud.core.storage.js | 10 +++++----- ui/2.1/scripts/cloud.core.templates.js | 8 ++++---- 9 files changed, 40 insertions(+), 44 deletions(-) diff --git a/ui/2.1/scripts/cloud.core.configuration.js b/ui/2.1/scripts/cloud.core.configuration.js index ba5fdc1e5e4..8ce89c430a2 100644 --- a/ui/2.1/scripts/cloud.core.configuration.js +++ b/ui/2.1/scripts/cloud.core.configuration.js @@ -657,7 +657,7 @@ function showConfigurationTab() { $("#add_publicip_vlan_type_container").show(); var podSelect = dialogAddVlanForZone.find("#add_publicip_vlan_pod").empty(); $.ajax({ - data: createURL("command=listPods&zoneId="+id+"&response=json"+maxPageSize), + data: createURL("command=listPods&zoneId="+id+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -674,7 +674,7 @@ function showConfigurationTab() { var domainSelect = dialogAddVlanForZone.find("#add_publicip_vlan_domain").empty(); $.ajax({ - data: createURL("command=listDomains&response=json"+maxPageSize), + data: createURL("command=listDomains&response=json"), dataType: "json", async: false, success: function(json) { @@ -1197,7 +1197,7 @@ function showConfigurationTab() { $("#submenu_content_global, #submenu_content_service, #submenu_content_disk").hide(); clearRightPanel(); $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; diff --git a/ui/2.1/scripts/cloud.core.domains.js b/ui/2.1/scripts/cloud.core.domains.js index a8a831b40fc..49cdf3b3685 100644 --- a/ui/2.1/scripts/cloud.core.domains.js +++ b/ui/2.1/scripts/cloud.core.domains.js @@ -66,7 +66,7 @@ function showDomainsTab() { function drawTree(id, level, container) { $.ajax({ - data: createURL("command=listDomainChildren&id="+id+"&response=json&pageSize=-1"), + data: createURL("command=listDomainChildren&id="+id+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -120,7 +120,7 @@ function showDomainsTab() { var accountType = (domainId==1)? 1: 2; $.ajax({ cache: false, - data: createURL("command=listAccounts&domainid="+domainId+"&accounttype="+accountType+"&response=json"+maxPageSize), + data: createURL("command=listAccounts&domainid="+domainId+"&accounttype="+accountType+"&response=json"), dataType: "json", success: function(json) { var accounts = json.listaccountsresponse.account; @@ -155,7 +155,7 @@ function showDomainsTab() { domainDetail.find("#domain_id").text(domainId); $.ajax({ cache: false, - data: createURL("command=listAccounts&domainid="+domainId+"&response=json"+maxPageSize), + data: createURL("command=listAccounts&domainid="+domainId+"&response=json"), dataType: "json", success: function(json) { var accounts = json.listaccountsresponse.account; @@ -321,7 +321,7 @@ function showDomainsTab() { rightPanelSearchResult.show(); var keyword = searchInput.val(); $.ajax({ - data: createURL("command=listDomains&keyword="+keyword+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation) + data: createURL("command=listDomains&keyword="+keyword+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -350,7 +350,7 @@ function showDomainsTab() { function drawRootNode(rootDomainId) { treeContentBox.empty(); $.ajax({ - data: createURL("command=listDomains&id="+rootDomainId+"&response=json&pageSize=-1"), //pageSize=-1 will return all items (no limitation) + data: createURL("command=listDomains&id="+rootDomainId+"&response=json"), dataType: "json", async: false, success: function(json) { diff --git a/ui/2.1/scripts/cloud.core.hosts.js b/ui/2.1/scripts/cloud.core.hosts.js index a31cf6ccd7d..985618eb9b8 100644 --- a/ui/2.1/scripts/cloud.core.hosts.js +++ b/ui/2.1/scripts/cloud.core.hosts.js @@ -34,7 +34,7 @@ function showHostsTab() { var dialogAddRouting = $("#dialog_add_routing"); $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -50,7 +50,7 @@ function showHostsTab() { dialogAddRouting.find("#host_zone").bind("change", function(event) { var zoneId = $(this).val(); $.ajax({ - data: createURL("command=listPods&zoneId="+zoneId+"&response=json"+maxPageSize), + data: createURL("command=listPods&zoneId="+zoneId+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -72,7 +72,7 @@ function showHostsTab() { return; var clusterSelect = dialogAddRouting.find("#cluster_select").empty(); $.ajax({ - data: createURL("command=listClusters&response=json&podid=" + podId+maxPageSize), + data: createURL("command=listClusters&response=json&podid=" + podId), dataType: "json", success: function(json) { var items = json.listclustersresponse.cluster; @@ -95,7 +95,7 @@ function showHostsTab() { zIndex: 2000 })); $.ajax({ - data: createURL("command=listOsCategories&response=json"+maxPageSize), + data: createURL("command=listOsCategories&response=json"), dataType: "json", success: function(json) { var categories = json.listoscategoriesresponse.oscategory; @@ -158,7 +158,7 @@ function showHostsTab() { var vms, routers, systemVms; $.ajax({ cache: false, - data: createURL("command=listVirtualMachines&hostid="+hostId+"&response=json"+maxPageSize), + data: createURL("command=listVirtualMachines&hostid="+hostId+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -169,7 +169,7 @@ function showHostsTab() { }); $.ajax({ cache: false, - data: createURL("command=listRouters&hostid="+hostId+"&response=json"+maxPageSize), + data: createURL("command=listRouters&hostid="+hostId+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -180,7 +180,7 @@ function showHostsTab() { }); $.ajax({ cache: false, - data: createURL("command=listSystemVms&hostid="+hostId+"&response=json"+maxPageSize), + data: createURL("command=listSystemVms&hostid="+hostId+"&response=json"), dataType: "json", async: false, success: function(json) { diff --git a/ui/2.1/scripts/cloud.core.init.js b/ui/2.1/scripts/cloud.core.init.js index d6c634361ca..23f81291352 100644 --- a/ui/2.1/scripts/cloud.core.init.js +++ b/ui/2.1/scripts/cloud.core.init.js @@ -618,9 +618,7 @@ $(document).ready(function() { $("#menutab_role_root").hide(); $("#menutab_role_domain").show(); $("#launch_test").hide(); - - // Need to use/create better API for this as there is a limit of pageSize - // to list count. + $.ajax({ data: createURL("command=listVirtualMachines&response=json"), dataType: "json", diff --git a/ui/2.1/scripts/cloud.core.instances.js b/ui/2.1/scripts/cloud.core.instances.js index ffd244f72ce..d668b06a7f1 100644 --- a/ui/2.1/scripts/cloud.core.instances.js +++ b/ui/2.1/scripts/cloud.core.instances.js @@ -970,7 +970,7 @@ function showInstancesTab(p_domainId, p_account) { var index = 0; $.ajax({ cache: false, - data: createURL("command=listVolumes&virtualMachineId="+vmId+"&response=json"+maxPageSize), + data: createURL("command=listVolumes&virtualMachineId="+vmId+"&response=json"), dataType: "json", success: function(json) { var volumes = json.listvolumesresponse.volume; @@ -1221,7 +1221,7 @@ function showInstancesTab(p_domainId, p_account) { vmWizardCleanup(); $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -1409,15 +1409,16 @@ function showInstancesTab(p_domainId, p_account) { var searchInput = vmPopup.find("#search_input").val(); if (selectedTemplateTypeInVmPopup != "blank") { if (searchInput != null && searchInput.length > 0) - commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; + commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&response=json"; else - commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; + commandString = "command=listTemplates&templatefilter="+selectedTemplateTypeInVmPopup+"&zoneid="+zoneId+"&hypervisor="+hypervisor+"&response=json"; } else { if (searchInput != null && searchInput.length > 0) - commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; + commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&keyword="+searchInput+"&response=json"; else - commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&page="+currentPageInTemplateGridInVmPopup+"&response=json"; + commandString = "command=listIsos&isReady=true&bootable=true&zoneid="+zoneId+"&hypervisor="+hypervisor+"&response=json"; } + commandString += commandString + "&pagesize="+vmPopupStep2PageSize + "&page="+currentPageInTemplateGridInVmPopup; var loading = vmPopup.find("#wiz_template_loading").show(); if(currentPageInTemplateGridInVmPopup==1) diff --git a/ui/2.1/scripts/cloud.core.js b/ui/2.1/scripts/cloud.core.js index 8120206731f..91916e16348 100644 --- a/ui/2.1/scripts/cloud.core.js +++ b/ui/2.1/scripts/cloud.core.js @@ -46,9 +46,6 @@ function getSystemVmUseLocalStorage() { return g_systemVmUseLocalStorage; } //keyboard keycode var keycode_Enter = 13; -//dropdown field size -var maxPageSize = "&pagesize=500"; - //XMLHttpResponse.status var ERROR_ACCESS_DENIED_DUE_TO_UNAUTHORIZED = 401; var ERROR_INTERNET_NAME_NOT_RESOLVED = 12007; @@ -365,7 +362,7 @@ function submenuContentEventBinder(submenuContent, listFunction) { var zoneSelect = submenuContent.find("#advanced_search #adv_search_zone"); if(zoneSelect.length>0) { //if zone dropdown is found on Advanced Search dialog $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -392,7 +389,7 @@ function submenuContentEventBinder(submenuContent, listFunction) { podLabel.css("color", "black"); podSelect.removeAttr("disabled"); $.ajax({ - data: createURL("command=listPods&zoneId="+zoneId+"&response=json"+maxPageSize), + data: createURL("command=listPods&zoneId="+zoneId+"&response=json"), dataType: "json", async: false, success: function(json) { @@ -417,7 +414,7 @@ function submenuContentEventBinder(submenuContent, listFunction) { if(domainSelect.length>0 && isAdmin()) { var domainSelect = domainSelect.empty(); $.ajax({ - data: createURL("command=listDomains&available=true&response=json"+maxPageSize), + data: createURL("command=listDomains&available=true&response=json"), dataType: "json", success: function(json) { var domains = json.listdomainsresponse.domain; @@ -435,7 +432,7 @@ function submenuContentEventBinder(submenuContent, listFunction) { vmSelect.empty(); vmSelect.append(""); $.ajax({ - data: createURL("command=listVirtualMachines&response=json"+maxPageSize), + data: createURL("command=listVirtualMachines&response=json"), dataType: "json", success: function(json) { var items = json.listvirtualmachinesresponse.virtualmachine; diff --git a/ui/2.1/scripts/cloud.core.network.js b/ui/2.1/scripts/cloud.core.network.js index fd95e5b9909..5b5d84e4b1d 100644 --- a/ui/2.1/scripts/cloud.core.network.js +++ b/ui/2.1/scripts/cloud.core.network.js @@ -29,7 +29,7 @@ function showNetworkingTab(p_domainId, p_account) { //*** Acquire New IP (begin) *** $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -215,7 +215,7 @@ function showNetworkingTab(p_domainId, p_account) { function populateDomainDropdown() { var domainSelect = $("#submenu_content_network #search_by_domain").empty(); $.ajax({ - data: createURL("command=listDomains&available=true&response=json"+maxPageSize), + data: createURL("command=listDomains&available=true&response=json"), dataType: "json", success: function(json) { var domains = json.listdomainsresponse.domain; @@ -379,7 +379,7 @@ function showNetworkingTab(p_domainId, p_account) { createPortForwardingRow.find("#protocol").val("TCP"); $.ajax({ - data: createURL("command=listVirtualMachines&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account")+maxPageSize), + data: createURL("command=listVirtualMachines&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account")), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; @@ -414,7 +414,7 @@ function showNetworkingTab(p_domainId, p_account) { var virtualMachineId = json.virtualmachineid; $.ajax({ - data: createURL("command=listVirtualMachines&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account")+maxPageSize), + data: createURL("command=listVirtualMachines&response=json&domainid="+ipPanel.data("ip_domainid")+"&account="+ipPanel.data("ip_account")), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; diff --git a/ui/2.1/scripts/cloud.core.storage.js b/ui/2.1/scripts/cloud.core.storage.js index 10ca6570729..df126acaab4 100644 --- a/ui/2.1/scripts/cloud.core.storage.js +++ b/ui/2.1/scripts/cloud.core.storage.js @@ -23,7 +23,7 @@ function showStorageTab(domainId, targetTab) { var populateZoneField = function(isAdmin) { $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -68,7 +68,7 @@ function showStorageTab(domainId, targetTab) { var populateVirtualMachineField = function(domainId, account, zoneId) { $.ajax({ cache: false, - data: createURL("command=listVirtualMachines&state=Running&zoneid="+zoneId+"&domainid="+domainId+"&account="+account+"&response=json"+maxPageSize), + data: createURL("command=listVirtualMachines&state=Running&zoneid="+zoneId+"&domainid="+domainId+"&account="+account+"&response=json"), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; @@ -80,7 +80,7 @@ function showStorageTab(domainId, targetTab) { } $.ajax({ cache: false, - data: createURL("command=listVirtualMachines&state=Stopped&zoneid="+zoneId+"&domainid="+domainId+"&account="+account+"&response=json"+maxPageSize), + data: createURL("command=listVirtualMachines&state=Stopped&zoneid="+zoneId+"&domainid="+domainId+"&account="+account+"&response=json"), dataType: "json", success: function(json) { var instances = json.listvirtualmachinesresponse.virtualmachine; @@ -1403,7 +1403,7 @@ function showStorageTab(domainId, targetTab) { if (expanded == null || expanded == false) { $.ajax({ cache: false, - data: createURL("command=listSnapshots&volumeid="+volumeId+"&response=json"+maxPageSize), + data: createURL("command=listSnapshots&volumeid="+volumeId+"&response=json"), dataType: "json", success: function(json) { var items = json.listsnapshotsresponse.snapshot; @@ -1770,7 +1770,7 @@ function showStorageTab(domainId, targetTab) { $("#dialog_add_pool").find("#pool_zone").bind("change", function(event) { var zoneId = $(this).val(); $.ajax({ - data: createURL("command=listPods&zoneId="+zoneId+"&response=json"+maxPageSize), + data: createURL("command=listPods&zoneId="+zoneId+"&response=json"), dataType: "json", async: false, success: function(json) { diff --git a/ui/2.1/scripts/cloud.core.templates.js b/ui/2.1/scripts/cloud.core.templates.js index ea3d4262ec2..2a7ffe35c28 100644 --- a/ui/2.1/scripts/cloud.core.templates.js +++ b/ui/2.1/scripts/cloud.core.templates.js @@ -67,7 +67,7 @@ function showTemplatesTab() { addIsoZoneField.append(""); } $.ajax({ - data: createURL("command=listZones&available=true&response=json"+maxPageSize), + data: createURL("command=listZones&available=true&response=json"), dataType: "json", success: function(json) { var zones = json.listzonesresponse.zone; @@ -93,7 +93,7 @@ function showTemplatesTab() { } $.ajax({ - data: createURL("command=listOsTypes&response=json"+maxPageSize), + data: createURL("command=listOsTypes&response=json"), dataType: "json", success: function(json) { types = json.listostypesresponse.ostype; @@ -110,7 +110,7 @@ function showTemplatesTab() { }); $.ajax({ - data: createURL("command=listServiceOfferings&response=json"+maxPageSize), + data: createURL("command=listServiceOfferings&response=json"), dataType: "json", success: function(json) { var items = json.listserviceofferingsresponse.serviceoffering; @@ -126,7 +126,7 @@ function showTemplatesTab() { }); $.ajax({ - data: createURL("command=listDiskOfferings&response=json"+maxPageSize), + data: createURL("command=listDiskOfferings&response=json"), dataType: "json", success: function(json) { var items = json.listdiskofferingsresponse.diskoffering;