apache/cloudstack
1
0
Fork 0
mirror of https://github.com/apache/cloudstack.git synced 2025-10-26 08:42:29 +01:00
Code Issues Packages Projects Releases Wiki Activity

CLOUDSTACK-10129: Show account, network info in VR list view (#2327)

Browse Source 
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>
This commit is contained in:
Rohit Yadav 2017-11-16 18:39:57 +05:30 committed by GitHub
parent 475aa03bb8
commit a1008f9ae2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
ui/scripts/system.js
View File

@ -29,9 +29,19 @@
var mapRouterType = function (index, router) { var mapRouterType = function (index, router) {
var routerType = _l('label.menu.system'); var routerType = _l('label.menu.system');
if (router.projectid) routerType = _l('label.project'); if (router.projectid) {
if (router.vpcid) routerType = _l('label.vpc'); routerType = _l('label.project');
if ("isredundantrouter" in router && router.isredundantrouter) routerType = routerType + " (" + router.redundantstate + ")"; 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, { return $.extend(router, {
routerType: routerType routerType: routerType
@ -9479,6 +9489,12 @@
publicip: { publicip: {
label: 'label.public.ip' label: 'label.public.ip'
}, },
account: {
label: 'label.account'
},
guestnetworkname: {
label: 'label.network'
},
routerType: { routerType: {
label: 'label.type' label: 'label.type'
}, },