CS-16407: cloudstack UI - Infrastructure page - total number of Virtual Routers should include both project type and account type.
Project: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/commit/a5f26969 Tree: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/tree/a5f26969 Diff: http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/diff/a5f26969 Branch: refs/heads/4.0 Commit: a5f26969e5166e703db028b87433551271af60d0 Parents: 632494d Author: Jessica Wang <[email protected]> Authored: Thu Sep 27 12:12:40 2012 -0700 Committer: Edison Su <[email protected]> Committed: Thu Sep 27 17:23:41 2012 -0700 ---------------------------------------------------------------------- ui/scripts/system.js | 19 ++++++++++++++----- 1 files changed, 14 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-cloudstack/blob/a5f26969/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 3759229..7b242bc 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -273,13 +273,22 @@ $.ajax({ url: createURL('listRouters'), data: { - listAll: true + projectid: -1 }, success: function(json) { - dataFns.capacity($.extend(data, { - virtualRouterCount: json.listroutersresponse.count ? - json.listroutersresponse.count : 0 - })); + var total1 = json.listroutersresponse.count ? json.listroutersresponse.count : 0; + $.ajax({ + url: createURL('listRouters'), + data: { + listAll: true + }, + success: function(json) { + var total2 = json.listroutersresponse.count ? json.listroutersresponse.count : 0; + dataFns.capacity($.extend(data, { + virtualRouterCount: (total1 + total2) + })); + } + }); } }); },
