Updated Branches: refs/heads/master c61d2eedf -> ac04a9f2e
CLOUDSTACK-4793: UI > Infrastructure > Virtual Routers > detail tab > add Version field which will include text "Requires Upgrade" if VR version is different from MS version. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/ac04a9f2 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/ac04a9f2 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/ac04a9f2 Branch: refs/heads/master Commit: ac04a9f2e138fbfb46bdb8c28fd1d5d811b165ac Parents: c61d2ee Author: Jessica Wang <[email protected]> Authored: Tue Nov 5 13:16:26 2013 -0800 Committer: Jessica Wang <[email protected]> Committed: Tue Nov 5 13:16:26 2013 -0800 ---------------------------------------------------------------------- ui/scripts/system.js | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ac04a9f2/ui/scripts/system.js ---------------------------------------------------------------------- diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 7d4ce2a..1579d16 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -7688,6 +7688,9 @@ state: { label: 'label.state' }, + version: { + label: 'label.version' + }, guestnetworkid: { label: 'label.network.id' }, @@ -7736,7 +7739,7 @@ dataType: 'json', async: true, success: function(json) { - var jsonObj = json.listroutersresponse.router[0]; + var jsonObj = json.listroutersresponse.router[0]; addExtraPropertiesToRouterInstanceObject(jsonObj); args.response.success({ actionFilter: routerActionfilter, @@ -16435,10 +16438,18 @@ } var addExtraPropertiesToRouterInstanceObject = function(jsonObj) { - if (jsonObj.isredundantrouter == true) + if (jsonObj.isredundantrouter == true) { jsonObj["redundantRouterState"] = jsonObj.redundantstate; - else + } else { jsonObj["redundantRouterState"] = ""; + } + + //jsonObj.version = '4.2.0-SNAPSHOT'; //for testing only + if (jsonObj.version != undefined && jsonObj.version.length > 0) { + if (jsonObj.version != g_cloudstackversion) { //if VirtualRouter version is different from management server version + jsonObj.version += " (Requires Upgrade)"; + } + } } var refreshNspData = function(nspName) {
