cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jessicaw...@apache.org
Subject git commit: updated refs/heads/4.5 to be60e46
Date Thu, 16 Oct 2014 19:11:35 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 5e165d499 -> be60e46e1


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.


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/be60e46e
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/be60e46e
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/be60e46e

Branch: refs/heads/4.5
Commit: be60e46e1efad93cb3c26bcf9ec9ee501239ffdf
Parents: 5e165d4
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Oct 16 12:01:20 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Oct 16 12:11:06 2014 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/be60e46e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ef4d7c1..31e991d 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 
                         }
                     }
                 },


Mime
View raw message