Updated Branches:
refs/heads/master 42e53702a -> d76fccd8c
CLOUDSTACK-5492: UI > Routers > Group by zone/pod/cluster/account > (1) fix a bug that requiresUpgrade wrongly showed"No" when it should show "Yes".
(2) detailView > add new field "Total of Virtual Routers that require upgrade".
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/d76fccd8
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/d76fccd8
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/d76fccd8
Branch: refs/heads/master
Commit: d76fccd8c94d3ab84a9980ea55bc7699f5a74196
Parents: 42e5370
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 10 15:57:08 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 10 16:03:19 2014 -0800
----------------------------------------------------------------------
ui/scripts/system.js | 55 ++++++++++++++++++++++++++++++++++++++++++-----
1 file changed, 50 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d76fccd8/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index a9b1620..64e4f5c 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9232,6 +9232,9 @@
return 'No';
}
}
+ },
+ numberOfRouterRequiresUpgrade: {
+ label: 'Total of Virtual Routers that require upgrade'
}
}],
dataProvider: function (args) {
@@ -9357,6 +9360,9 @@
}
}
},
+ numberOfRouterRequiresUpgrade: {
+ label: 'Total of Virtual Routers that require upgrade'
+ },
zonename: {
label: 'label.zone'
}
@@ -9484,6 +9490,9 @@
}
}
},
+ numberOfRouterRequiresUpgrade: {
+ label: 'Total of Virtual Routers that require upgrade'
+ },
podname: {
label: 'label.pod'
},
@@ -9567,6 +9576,14 @@
var routerCountFromAllPages = json.listroutersresponse.count;
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
+
+ var items = json.listroutersresponse.router;
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
+ routerRequiresUpgrade++;
+ }
+ }
+
var callListApiWithPage = function () {
$.ajax({
url: createURL('listRouters'),
@@ -9581,8 +9598,8 @@
success: function (json) {
routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
var items = json.listroutersresponse.router;
- for (var i = 0; i < items.length; i++) {
- if (items[i].requiresupgrade) {
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
routerRequiresUpgrade++;
}
}
@@ -9673,6 +9690,9 @@
return 'No';
}
}
+ },
+ numberOfRouterRequiresUpgrade: {
+ label: 'Total of Virtual Routers that require upgrade'
}
}],
dataProvider: function (args) {
@@ -9693,6 +9713,14 @@
var routerCountFromAllPages = json.listroutersresponse.count;
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
+
+ var items = json.listroutersresponse.router;
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
+ routerRequiresUpgrade++;
+ }
+ }
+
var callListApiWithPage = function () {
$.ajax({
url: createURL('listRouters'),
@@ -9707,8 +9735,8 @@
success: function (json) {
routerCountFromFirstPageToCurrentPage += json.listroutersresponse.router.length;
var items = json.listroutersresponse.router;
- for (var i = 0; i < items.length; i++) {
- if (items[i].requiresupgrade) {
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
routerRequiresUpgrade++;
}
}
@@ -9724,9 +9752,11 @@
callListApiWithPage();
}
args.context.routerGroupByAccount[0].routerRequiresUpgrade = routerRequiresUpgrade;
+ args.context.routerGroupByAccount[0].numberOfRouterRequiresUpgrade = routerRequiresUpgrade;
} else {
args.context.routerGroupByAccount[0].routerCount = 0;
args.context.routerGroupByAccount[0].routerRequiresUpgrade = 0;
+ args.context.routerGroupByAccount[0].numberOfRouterRequiresUpgrade = 0;
}
}
});
@@ -18946,6 +18976,13 @@
var routerCountFromFirstPageToCurrentPage = json.listroutersresponse.router.length;
var routerRequiresUpgrade = 0;
+ var items = json.listroutersresponse.router;
+ for (var k = 0; k < items.length; k++) {
+ if (items[k].requiresupgrade) {
+ routerRequiresUpgrade++;
+ }
+ }
+
$.ajax({
url: createURL('listRouters'),
data: $.extend({}, listRoutersData, {
@@ -18959,6 +18996,13 @@
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;
}
@@ -19021,10 +19065,11 @@
}
groupbyObj.routerRequiresUpgrade = routerRequiresUpgrade;
-
+ groupbyObj.numberOfRouterRequiresUpgrade = routerRequiresUpgrade;
} else {
groupbyObj.routerCount = 0;
groupbyObj.routerRequiresUpgrade = 0;
+ groupbyObj.numberOfRouterRequiresUpgrade = 0;
}
}
});