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 d96e599
Date Tue, 20 Aug 2013 21:40:24 GMT
Updated Branches:
  refs/heads/master 4bee74464 -> d96e599c7


CLOUDSTACK-3950: UI > template/ISO page > hide copyTemplate/copyISO action when secondary
storage is region-wide.


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

Branch: refs/heads/master
Commit: d96e599c7d1fb3f867c4e0dfdb03d880dba6b071
Parents: 4bee744
Author: Jessica Wang <jessicawang@apache.org>
Authored: Tue Aug 20 14:39:31 2013 -0700
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Tue Aug 20 14:40:15 2013 -0700

----------------------------------------------------------------------
 ui/scripts/templates.js | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/d96e599c/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 0acb36e..3f79b09 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1677,10 +1677,8 @@
             //do nothing
         } else {
             allowedActions.push("edit");
-
-            //Swift and S3 are region-wide secondary storage
-            //if (havingSwift == false && havingS3 == false)
-			if (havingSwift == false && jsonObj.zoneid != null) { //"jsonObj.zoneid == null"
means it is registered on region-wide S3 => global to all zones 
+            
+            if(g_regionsecondaryenabled != true) {
                 allowedActions.push("copyTemplate");
             }
 			
@@ -1718,8 +1716,7 @@
         } else {
             allowedActions.push("edit");
 
-			//Swift and S3 are region-wide secondary storage
-            if (havingSwift == false && jsonObj.zoneid != null) { //"jsonObj.zoneid
== null" means it is registered on region-wide S3 => global to all zones 
+            if(g_regionsecondaryenabled != true) {
                 allowedActions.push("copyISO");
 			}
         }


Mime
View raw message