From 7004deb528657c7e5403118926836b7fd19717c0 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Wed, 15 Oct 2014 17:02:21 -0700 Subject: [PATCH] CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view > listView > detailView > add View All link > not show "group by XXXXXXX" in select view dropdown. --- ui/scripts/system.js | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index f87de623074..ef4d7c17c5d 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -9391,7 +9391,16 @@ subsections: { virtualRouters: { sectionSelect: { - label: 'label.select-view' + label: 'label.select-view', + preFilter: function(args) { + //Only clicking ViewAll Link("view all Virtual Routers") in "Virtual Routers group by XXXXXXX" detailView will have "routerGroupByXXXXXXX" included in args.context + if (("routerGroupByZone" in args.context) || ("routerGroupByPod" in args.context) || ("routerGroupByCluster" in args.context) || ("routerGroupByAccount" in args.context)) { + return ["routerNoGroup"]; + } + else { + return ["routerNoGroup", "routerGroupByZone", "routerGroupByPod", "routerGroupByCluster", "routerGroupByAccount"]; + } + } }, sections: { routerNoGroup: {