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/master to 5dc1d46
Date Fri, 13 Dec 2013 22:00:23 GMT
Updated Branches:
  refs/heads/master 44f71f06e -> 5dc1d46c6


CLOUDSTACK-5345: UI > Infrastructure > virtual routers > group by zone/pod/cluster/account
> hide Upgrade Router to Use Newer Template action when upgrade is not required (i.e. all
rouster under the zone/pod/cluster/account have latest version).


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

Branch: refs/heads/master
Commit: 5dc1d46c6dbc2187fe4324e6774483a6b7729e59
Parents: 44f71f0
Author: Jessica Wang <jessicawang@apache.org>
Authored: Fri Dec 13 13:59:28 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Fri Dec 13 14:00:14 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5dc1d46c/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 2d0d80f..b490d0d 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8985,7 +8985,8 @@
 
                                             setTimeout(function() {
                                                 args.response.success({
-                                                    data: args.context.routerGroupByZone[0]
+                                                    data: args.context.routerGroupByZone[0],
+                                                    actionFilter: routerGroupActionfilter
                                                 })
                                             });
                                         }
@@ -9218,7 +9219,8 @@
                                             });
                                             setTimeout(function() {
                                                 args.response.success({
-                                                    data: args.context.routerGroupByPod[0]
+                                                    data: args.context.routerGroupByPod[0],
+                                                    actionFilter: routerGroupActionfilter
                                                 });
                                             });
                                         }
@@ -9454,7 +9456,8 @@
                                             });
                                             setTimeout(function() {
                                                 args.response.success({
-                                                    data: args.context.routerGroupByCluster[0]
+                                                    data: args.context.routerGroupByCluster[0],
+                                                    actionFilter: routerGroupActionfilter
                                                 });
                                             });
                                         }
@@ -9693,7 +9696,8 @@
                                             });
                                             setTimeout(function() {
                                                 args.response.success({
-                                                    data: args.context.routerGroupByAccount[0]
+                                                    data: args.context.routerGroupByAccount[0],
+                                                    actionFilter: routerGroupActionfilter
                                                 });
                                             });
                                         }
@@ -18707,7 +18711,16 @@
         }
         return allowedActions;
     }
-
+    
+    var routerGroupActionfilter = function(args) {
+        var jsonObj = args.context.item;
+        var allowedActions = [];
+        if (jsonObj.routerRequiresUpgrade > 0) {
+            allowedActions.push("upgradeRouterToUseNewerTemplate");    
+        }     
+        return allowedActions;
+    }
+        
     var bladeActionfilter = function(args) {
         var jsonObj = args.context.item;
         var allowedActions = [];


Mime
View raw message