rhtyd closed pull request #2327: CLOUDSTACK-10129: Show account, network info
in VR list view
URL: https://github.com/apache/cloudstack/pull/2327
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 9fc96ce5f66..fc9b4b8626a 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'
},
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
