You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/01/09 00:19:36 UTC
git commit: updated refs/heads/master to da260d1
Updated Branches:
refs/heads/master 07557eb57 -> da260d17f
CLOUDSTACK-5733: UI > Virtual Routers > group by zone/pod/cluster: fix a bug that "Total of Virtual Routers" in first row is blank.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/da260d17
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/da260d17
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/da260d17
Branch: refs/heads/master
Commit: da260d17f1237e1949521fc751b9c69d9fc498f1
Parents: 07557eb
Author: Jessica Wang <je...@apache.org>
Authored: Wed Jan 8 14:54:08 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Wed Jan 8 15:19:04 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 177 +++++++++++++++++++++++++---------------------
1 file changed, 96 insertions(+), 81 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/da260d17/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 81c78d5..15b61b9 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -18962,87 +18962,102 @@
page: currentPage
}),
async: false,
- success: function (json) {
- if (json.listroutersresponse.count != undefined) {
- var routerCountFromAllPages = json.listroutersresponse.count;
- var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
- var routerRequiresUpgrade = 0;
-
- $.ajax({
- url: createURL('listRouters'),
- data: $.extend({
- },
- listRoutersData, {
- page: currentPage,
- projectid: -1
- }),
- async: false,
- success: function (json) {
- if (json.listroutersresponse.count != undefined) {
- routerCountFromAllPages += json.listroutersresponse.count;
- groupbyObj.routerCount = routerCountFromAllPages;
-
- routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
- }
- }
- });
-
- var callListApiWithPage = function () {
- $.ajax({
- url: createURL('listRouters'),
- async: false,
- data: $.extend({
- },
- listRoutersData, {
- page: currentPage
- }),
- success: function (json) {
- routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
- var items = json.listroutersresponse.router;
- for (var k = 0; k < items.length; k++) {
- if (items[k].requiresupgrade) {
- routerRequiresUpgrade++;
- }
- }
-
- $.ajax({
- url: createURL('listRouters'),
- async: false,
- data: $.extend({
- },
- listRoutersData, {
- page: currentPage,
- projectid: -1
- }),
- success: function (json) {
- routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
- var items = json.listroutersresponse.router;
- for (var k = 0; k < items.length; k++) {
- if (items[k].requiresupgrade) {
- routerRequiresUpgrade++;
- }
- }
- }
- });
-
- if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
- currentPage++;
- callListApiWithPage();
- }
- }
- });
- }
-
- if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
- currentPage++;
- callListApiWithPage();
- }
-
- groupbyObj.routerRequiresUpgrade = routerRequiresUpgrade;
- } else {
- groupbyObj.routerCount = 0;
- groupbyObj.routerRequiresUpgrade = 0;
- }
+ success: function(json) {
+ if (json.listroutersresponse.count != undefined) {
+ var routerCountFromAllPages = json.listroutersresponse.count;
+ var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
+ var routerRequiresUpgrade = 0;
+
+ $.ajax({
+ url: createURL('listRouters'),
+ data: $.extend({}, listRoutersData, {
+ page: currentPage,
+ projectid: -1
+ }),
+ async: false,
+ success: function(json) {
+ if (json.listroutersresponse.count != undefined) {
+ routerCountFromAllPages += json.listroutersresponse.count;
+ groupbyObj.routerCount = routerCountFromAllPages;
+
+ routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
+ } else {
+ groupbyObj.routerCount = routerCountFromAllPages;
+ }
+ }
+ });
+
+ var callListApiWithPage = function() {
+ $.ajax({
+ url: createURL('listRouters'),
+ async: false,
+ data: $.extend({}, listRoutersData, {
+ page: currentPage
+ }),
+ success: function(json) {
+ routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
+ var items = json.listroutersresponse.router;
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
+ routerRequiresUpgrade++;
+ }
+ }
+
+ $.ajax({
+ url: createURL('listRouters'),
+ async: false,
+ data: $.extend({}, listRoutersData, {
+ page: currentPage,
+ projectid: -1
+ }),
+ success: function(json) {
+ if (json.listroutersresponse.count != undefined) {
+ routerCountFromAllPages += json.listroutersresponse.count;
+ groupbyObj.routerCount = routerCountFromAllPages;
+
+ routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
+ } else {
+ groupbyObj.routerCount = routerCountFromAllPages;
+ }
+
+
+ if (json.listroutersresponse.count != undefined) {
+ routerCountFromAllPages += json.listroutersresponse.count;
+ groupbyObj.routerCount = routerCountFromAllPages;
+
+ routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
+
+ var items = json.listroutersresponse.router;
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
+ routerRequiresUpgrade++;
+ }
+ }
+ } else {
+ groupbyObj.routerCount = routerCountFromAllPages;
+ }
+ }
+ });
+
+ if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
+ currentPage++;
+ callListApiWithPage();
+ }
+ }
+ });
+ }
+
+ if (routerCountFromFirstPageToCurrentPage < routerCountFromAllPages) {
+ currentPage++;
+ callListApiWithPage();
+ }
+
+ groupbyObj.routerRequiresUpgrade = routerRequiresUpgrade;
+
+ } else {
+ groupbyObj.routerCount = 0;
+ groupbyObj.routerRequiresUpgrade = 0;
+ }
}
});
}