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 e225065
Date Thu, 16 Oct 2014 19:08:21 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/4.5 d081efc64 -> e225065ec


CLOUDSTACK-7731: UI > Infrastructure > Virtual Routers > group by zone/pod/cluster
view > listView > detailView > add View All link (i.e. "View all Virtual Routers").


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

Branch: refs/heads/4.5
Commit: e225065ec2510a93a1f3f694050645687b2969d0
Parents: d081efc
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Oct 16 12:06:59 2014 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Oct 16 12:06:59 2014 -0700

----------------------------------------------------------------------
 ui/scripts/system.js | 45 ++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 42 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e225065e/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 1a14e31..fbd2f2b 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -9445,6 +9445,27 @@
                                     // forvpc: false
                                 };
                                 
+                                if (args.context != undefined) {
+	                                if ("routerGroupByZone" in args.context) {
+	                                    $.extend(data2, {
+	                                        zoneid: args.context.routerGroupByZone[0].id
+	                                    })
+	                                } else if ("routerGroupByPod" in args.context) {
+	                                    $.extend(data2, {
+	                                        podid: args.context.routerGroupByPod[0].id
+	                                    })
+	                                } else if ("routerGroupByCluster" in args.context) {
+	                                    $.extend(data2, {
+	                                        clusterid: args.context.routerGroupByCluster[0].id
+	                                    })
+	                                } else if ("routerGroupByAccount" in args.context) {
+	                                    $.extend(data2, {
+	                                    	 account: args.context.routerGroupByAccount[0].name,
+	                                         domainid: args.context.routerGroupByAccount[0].domainid
+	                                    })
+	                                }
+                                }                               
+                                
                                 var routers =[];
                                 $.ajax({
                                     url: createURL("listRouters&listAll=true&page="
+ args.page + "&pagesize=" + pageSize + array1.join("")),
@@ -10078,7 +10099,11 @@
                                 });
                             },
                             detailView: {
-                                name: 'label.virtual.routers.group.zone',
+                                name: 'label.virtual.routers.group.zone',               
                
+                                viewAll: {
+                                    path: '_zone.virtualRouters',
+                                    label: 'label.virtual.appliances'
+                                },                                
                                 actions: {
                                     upgradeRouterToUseNewerTemplate: {
                                         label: 'label.upgrade.router.newer.template',
@@ -10205,7 +10230,11 @@
                                 });
                             },
                             detailView: {
-                                name: 'label.virtual.routers.group.pod',
+                                name: 'label.virtual.routers.group.pod',                
               
+                                viewAll: {
+                                    path: '_zone.virtualRouters',
+                                    label: 'label.virtual.appliances'
+                                },                               
                                 actions: {
                                     upgradeRouterToUseNewerTemplate: {
                                         label: 'label.upgrade.router.newer.template',
@@ -10335,7 +10364,11 @@
                                 });
                             },
                             detailView: {
-                                name: 'label.virtual.routers.group.cluster',
+                                name: 'label.virtual.routers.group.cluster',            
                  
+                                viewAll: {
+                                    path: '_zone.virtualRouters',
+                                    label: 'label.virtual.appliances'
+                                },                               
                                 actions: {
                                     upgradeRouterToUseNewerTemplate: {
                                         label: 'label.upgrade.router.newer.template',
@@ -10533,6 +10566,12 @@
                             },
                             detailView: {
                                 name: 'label.virtual.routers.group.account',
+                                /*
+                                viewAll: {
+                                    path: '_zone.virtualRouters',
+                                    label: 'label.virtual.appliances'
+                                },
+                                */
                                 actions: {
                                     upgradeRouterToUseNewerTemplate: {
                                         label: 'label.upgrade.router.newer.template',


Mime
View raw message