You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2014/10/16 21:10:45 UTC
git commit: updated refs/heads/4.5 to 5e165d4
Repository: cloudstack
Updated Branches:
refs/heads/4.5 f8cbd6ad4 -> 5e165d499
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.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5e165d49
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5e165d49
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5e165d49
Branch: refs/heads/4.5
Commit: 5e165d499e5e81f6941e74a60b628a544523780a
Parents: f8cbd6a
Author: Jessica Wang <je...@apache.org>
Authored: Wed Oct 15 17:02:21 2014 -0700
Committer: Jessica Wang <je...@apache.org>
Committed: Thu Oct 16 12:10:34 2014 -0700
----------------------------------------------------------------------
ui/scripts/system.js | 11 ++++++++++-
1 file changed, 10 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5e165d49/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index f87de62..ef4d7c1 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: {