From be60e46e1efad93cb3c26bcf9ec9ee501239ffdf Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 16 Oct 2014 12:01:20 -0700 Subject: [PATCH] CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by XXXXXXX view > listView > detailView > add View All link > show read-only text "group by zone/pod/cluster/account" in select view area. --- ui/scripts/system.js | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/ui/scripts/system.js b/ui/scripts/system.js index ef4d7c17c5d..31e991d9d6a 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -9394,11 +9394,16 @@ 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"]; + if ("routerGroupByZone" in args.context) { + return ["routerGroupByZone"]; // read-only (i.e. text "group by Zone") + } else if ( "routerGroupByPod" in args.context) { + return ["routerGroupByPod"]; // read-only (i.e. text "group by Pod") + } else if ("routerGroupByCluster" in args.context) { + return ["routerGroupByCluster"]; // read-only (i.e. text "group by Cluster") + } else if ("routerGroupByAccount" in args.context) { + return ["routerGroupByAccount"]; // read-only (i.e. text "group by Account") + } else { + return ["routerNoGroup", "routerGroupByZone", "routerGroupByPod", "routerGroupByCluster", "routerGroupByAccount"]; //editable dropdown } } },