From d96e599c7d1fb3f867c4e0dfdb03d880dba6b071 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Tue, 20 Aug 2013 14:39:31 -0700 Subject: [PATCH] CLOUDSTACK-3950: UI > template/ISO page > hide copyTemplate/copyISO action when secondary storage is region-wide. --- ui/scripts/templates.js | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 0acb36e81d1..3f79b09cf3b 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"); } }