From 463a1020bae646bcf0b99915ebaca4eaf9d94f5b Mon Sep 17 00:00:00 2001 From: Pierre-Luc Dion Date: Sun, 30 Nov 2014 21:14:03 -0500 Subject: [PATCH] CLOUDSTACK-7482: removed listAll from UI for API call not supporting it, still some left --- ui/scripts/configuration.js | 8 ++------ ui/scripts/domains.js | 8 ++------ ui/scripts/network.js | 15 ++++---------- ui/scripts/regions.js | 6 +++--- ui/scripts/storage.js | 4 +--- ui/scripts/system.js | 41 ++++++++----------------------------- 6 files changed, 21 insertions(+), 61 deletions(-) diff --git a/ui/scripts/configuration.js b/ui/scripts/configuration.js index 0e673b3a4ab..0a5a017923b 100644 --- a/ui/scripts/configuration.js +++ b/ui/scripts/configuration.js @@ -2248,9 +2248,7 @@ // Check whether there are any advanced zones $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, async: false, success: function(json) { var zones = json.listzonesresponse.zone; @@ -3509,9 +3507,7 @@ // Check whether there are any advanced zones $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, async: false, success: function(json) { var zones = json.listzonesresponse.zone; diff --git a/ui/scripts/domains.js b/ui/scripts/domains.js index e585d85af2a..a3cc8c063b3 100644 --- a/ui/scripts/domains.js +++ b/ui/scripts/domains.js @@ -488,9 +488,7 @@ $.ajax({ url: createURL("listAccounts&domainid=" + domainObj.id), async: false, - data: { - details: 'min' - }, + data: {}, success: function(json) { var items = json.listaccountsresponse.account; if (items != null) { @@ -508,9 +506,7 @@ $.ajax({ url: createURL("listProjects&domainid=" + domainObj.id), async: false, - data: { - details: 'min' - }, + data: {}, success: function(json) { var items = json.listprojectsresponse.project; if (items != null) { diff --git a/ui/scripts/network.js b/ui/scripts/network.js index c31ba76bc87..7d961905d67 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -398,8 +398,7 @@ }), data: { supportedServices: 'SecurityGroup', - listAll: true, - details: 'min' + listAll: true }, async: false, success: function(json) { @@ -5327,9 +5326,7 @@ required: true }, select: function(args) { - var data = { - listAll: true - }; + var data = {}; $.ajax({ url: createURL('listZones'), data: data, @@ -5387,14 +5384,10 @@ }, select: function(args) { - var data = { - listAll: true - }; + var data = {}; $.ajax({ url: createURL('listVPCOfferings'), - data: { - listAll: true - }, + data: {}, success: function(json) { var offerings = json.listvpcofferingsresponse.vpcoffering ? json.listvpcofferingsresponse.vpcoffering : []; var filteredofferings = $.grep(offerings, function(offering) { diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js index 950a2383d57..fab43e65271 100644 --- a/ui/scripts/regions.js +++ b/ui/scripts/regions.js @@ -27,7 +27,7 @@ regionSelector: { dataProvider: function(args) { $.ajax({ - url: createURL('listRegions&listAll=true'), + url: createURL('listRegions'), success: function(json) { var regions = json.listregionsresponse.region; @@ -130,7 +130,7 @@ }, dataProvider: function(args) { $.ajax({ - url: createURL('listRegions&listAll=true'), + url: createURL('listRegions'), success: function(json) { var items = json.listregionsresponse.region; args.response.success({ @@ -246,7 +246,7 @@ }], dataProvider: function(args) { $.ajax({ - url: createURL('listRegions&listAll=true'), + url: createURL('listRegions'), data: { id: args.context.regions[0].id }, diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 3608f4d58f7..f1626daf7d8 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -388,9 +388,7 @@ select: function(args) { $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, success: function(json) { var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone : []; diff --git a/ui/scripts/system.js b/ui/scripts/system.js index b6a35a32e05..58b7a53eb87 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -221,7 +221,6 @@ $.ajax({ url: createURL('listZones'), data: { - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }, @@ -238,7 +237,6 @@ $.ajax({ url: createURL('listPods'), data: { - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }, @@ -254,7 +252,6 @@ $.ajax({ url: createURL('listClusters'), data: { - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }, @@ -278,7 +275,6 @@ hostCount: function (data) { var data2 = { type: 'routing', - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }; @@ -295,7 +291,6 @@ primaryStorageCount: function (data) { var data2 = { - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }; @@ -312,8 +307,6 @@ secondaryStorageCount: function (data) { var data2 = { - type: 'SecondaryStorage', - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }; @@ -332,7 +325,6 @@ $.ajax({ url: createURL('listSystemVms'), data: { - listAll: true, page: 1, pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. }, @@ -1058,7 +1050,7 @@ }, dataProvider: function (args) { $.ajax({ - url: createURL("listStorageNetworkIpRange&zoneid=" + args.context.zones[0].id + "&networkId=" + selectedPublicNetworkObj.id), + url: createURL("listStorageNetworkIpRange&zoneid=" + args.context.zones[0].id), dataType: "json", success: function (json) { var items = json.liststoragenetworkiprangeresponse.storagenetworkiprange; @@ -9076,7 +9068,6 @@ $.ajax({ url: createURL('listHosts'), data: { - listAll: true, details: 'min' }, success: function (json) { @@ -13113,9 +13104,7 @@ select: function (args) { var data = args.context.zones ? { id: args.context.zones[0].id - }: { - listAll: true - }; + }: {}; $.ajax({ url: createURL('listZones'), @@ -13902,9 +13891,7 @@ select: function (args) { var data = args.context.zones ? { id: args.context.zones[0].id - }: { - listAll: true - }; + }: {}; $.ajax({ url: createURL('listZones'), @@ -15130,9 +15117,7 @@ select: function (args) { var data = args.context.zones ? { id: args.context.zones[0].id - }: { - listAll: true - }; + }: {}; $.ajax({ url: createURL('listZones'), @@ -16461,9 +16446,7 @@ select: function (args) { var data = args.context.zones ? { id: args.context.zones[0].id - }: { - listAll: true - }; + }: {}; $.ajax({ url: createURL('listZones'), @@ -17053,7 +17036,7 @@ select: function (args) { var data = args.context.providers ? { id: args.context.providers[0].id } : - { listAll: true }; + {}; $.ajax({ url: createURL('listStorageProviders'), @@ -18580,9 +18563,7 @@ select: function (args) { $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, success: function (json) { var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone:[]; @@ -18704,9 +18685,7 @@ select: function (args) { $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, success: function (json) { var zones = json.listzonesresponse.zone; @@ -19146,9 +19125,7 @@ select: function (args) { $.ajax({ url: createURL('listZones'), - data: { - listAll: true - }, + data: {}, success: function (json) { var zones = json.listzonesresponse.zone ? json.listzonesresponse.zone:[];