Updated Branches: refs/heads/master f1973340d -> 4e7487366
CLOUDSTACK-5200: UI > Infrastructure > Sockets > listView > fix a bug that Hosts and Sockets displayed wrong number. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/4e748736 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/4e748736 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/4e748736 Branch: refs/heads/master Commit: 4e7487366968578f5e9418c92208f12b5775580b Parents: f197334 Author: Jessica Wang <[email protected]> Authored: Wed Dec 4 14:10:24 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Wed Dec 4 14:11:39 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 40 ++++++++++++++++++++-------------------- 1 file changed, 20 insertions(+), 20 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4e748736/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 0d8784f..cdece2f 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -392,19 +392,22 @@ var currentPage = 1; var returnedHostCount = 0; var returnedHostCpusocketsSum = 0; - var returnedHostHavingCpusockets = true; - + var callListHostsWithPage = function(setTotalHostCount) { $.ajax({ url: createURL('listHosts'), async: false, data: { type: 'routing', - hypervisortype: hypervisor.name, + hypervisor: hypervisor.name, page: currentPage, pagesize: pageSize //global variable }, - success: function(json) { + success: function(json) { + if (json.listhostsresponse.count == undefined) { + return; + } + if (setTotalHostCount) { totalHostCount = json.listhostsresponse.count; } @@ -414,9 +417,7 @@ for (var i = 0; i < items.length; i++) { if (items[i].cpusockets != undefined && isNaN(items[i].cpusockets) == false) { returnedHostCpusocketsSum += items[i].cpusockets; - } else { - returnedHostHavingCpusockets = false; - } + } } if (returnedHostCount < totalHostCount) { @@ -428,10 +429,8 @@ } callListHostsWithPage(true); - - if (returnedHostHavingCpusockets) { - socketCount += returnedHostCpusocketsSum; - } + + socketCount += returnedHostCpusocketsSum; }) }); } @@ -7496,19 +7495,22 @@ var currentPage = 1; var returnedHostCount = 0; var returnedHostCpusocketsSum = 0; - var returnedHostHavingCpusockets = true; - + var callListHostsWithPage = function(setTotalHostCount) { $.ajax({ url: createURL('listHosts'), async: false, data: { type: 'routing', - hypervisortype: hypervisor.name, + hypervisor: hypervisor.name, page: currentPage, pagesize: pageSize //global variable }, - success: function(json) { + success: function(json) { + if (json.listhostsresponse.count == undefined) { + return; + } + if (setTotalHostCount) { totalHostCount = json.listhostsresponse.count; } @@ -7518,9 +7520,7 @@ for (var i = 0; i < items.length; i++) { if (items[i].cpusockets != undefined && isNaN(items[i].cpusockets) == false) { returnedHostCpusocketsSum += items[i].cpusockets; - } else { - returnedHostHavingCpusockets = false; - } + } } if (returnedHostCount < totalHostCount) { @@ -7532,11 +7532,11 @@ } callListHostsWithPage(true); - + return { hypervisor: hypervisor.name, hosts: totalHostCount, - sockets: (returnedHostHavingCpusockets? returnedHostCpusocketsSum : 'unknown') + sockets: returnedHostCpusocketsSum }; }) });
