cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bhais...@apache.org
Subject [cloudstack] branch master updated: CLOUDSTACK-10129: Show account, network info in VR list view (#2327)
Date Thu, 16 Nov 2017 13:10:02 GMT
This is an automated email from the ASF dual-hosted git repository.

bhaisaab pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cloudstack.git


The following commit(s) were added to refs/heads/master by this push:
     new a1008f9  CLOUDSTACK-10129: Show account, network info in VR list view (#2327)
a1008f9 is described below

commit a1008f9ae28cf664bb5a26b109332baf3425b6df
Author: Rohit Yadav <bhaisaab@apache.org>
AuthorDate: Thu Nov 16 18:39:57 2017 +0530

    CLOUDSTACK-10129: Show account, network info in VR list view (#2327)
    
    This shows the owner account and network of a VR in the VR list view,
    and for VPCs shows the VPC name and redundant state of the VPC rVR.
    
    Signed-off-by: Rohit Yadav <rohit.yadav@shapeblue.com>
---
 ui/scripts/system.js | 22 +++++++++++++++++++---
 1 file changed, 19 insertions(+), 3 deletions(-)

diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9fc96ce..fc9b4b8 100755
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -29,9 +29,19 @@
     var mapRouterType = function (index, router) {
         var routerType = _l('label.menu.system');
 
-        if (router.projectid) routerType = _l('label.project');
-        if (router.vpcid) routerType = _l('label.vpc');
-        if ("isredundantrouter" in router && router.isredundantrouter) routerType
= routerType + " (" + router.redundantstate + ")";
+        if (router.projectid) {
+            routerType = _l('label.project');
+            router.account = router.project;
+        }
+
+        if (router.vpcid) {
+            routerType = _l('label.vpc');
+            router.guestnetworkname = router.vpcname;
+        }
+
+        if ("isredundantrouter" in router && router.isredundantrouter) {
+            router.guestnetworkname = router.guestnetworkname + " (" + router.redundantstate
+ ")";
+        }
 
         return $.extend(router, {
             routerType: routerType
@@ -9479,6 +9489,12 @@
                                 publicip: {
                                     label: 'label.public.ip'
                                 },
+                                account: {
+                                    label: 'label.account'
+                                },
+                                guestnetworkname: {
+                                    label: 'label.network'
+                                },
                                 routerType: {
                                     label: 'label.type'
                                 },

-- 
To stop receiving notification emails like this one, please contact
['"commits@cloudstack.apache.org" <commits@cloudstack.apache.org>'].

Mime
View raw message