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 d5fcc6e
Date Fri, 13 Dec 2013 00:06:25 GMT
Updated Branches:
  refs/heads/master 523d9dc3c -> d5fcc6ef5


CLOUDSTACK-5345: UI > Infrastructure > virtual routers > no grouping > hide Upgrade
Router to Use Newer Template action when a router has latest version (i.e. does not require
upgrade).


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

Branch: refs/heads/master
Commit: d5fcc6ef5a75544e36cddc8f730fd61197fb324b
Parents: 523d9dc
Author: Jessica Wang <jessicawang@apache.org>
Authored: Thu Dec 12 16:05:12 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Thu Dec 12 16:06:11 2013 -0800

----------------------------------------------------------------------
 ui/scripts/system.js | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d5fcc6ef/ui/scripts/system.js
----------------------------------------------------------------------
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index ef08e7b..2d0d80f 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -18632,7 +18632,9 @@
         var jsonObj = args.context.item;
         var allowedActions = [];
 
-        allowedActions.push('upgradeRouterToUseNewerTemplate');
+        if(jsonObj.requiresupgrade == true) {
+            allowedActions.push('upgradeRouterToUseNewerTemplate');
+        }
         
         if (jsonObj.state == 'Running') {
             allowedActions.push("stop");


Mime
View raw message