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.3 to 2a56f64
Date Mon, 23 Dec 2013 19:33:59 GMT
Updated Branches:
  refs/heads/4.3 b8e141192 -> 2a56f64d9


CLOUDSTACK-5606: UI > Copy Template action, Copy ISO action is now availble to region-wide
secondary storage (S3, Swift).


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

Branch: refs/heads/4.3
Commit: 2a56f64d931b60e78d3b09877ff84bf12f0b5207
Parents: b8e1411
Author: Jessica Wang <jessicawang@apache.org>
Authored: Mon Dec 23 11:33:39 2013 -0800
Committer: Jessica Wang <jessicawang@apache.org>
Committed: Mon Dec 23 11:33:39 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2a56f64d/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index abadee8..286ee26 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1812,9 +1812,12 @@
         } else {
             allowedActions.push("edit");
             
+            allowedActions.push("copyTemplate");
+            /*
             if(g_regionsecondaryenabled != true) {
                 allowedActions.push("copyTemplate");
             }
+            */
 			
             //allowedActions.push("createVm"); // For Beta2, this simply doesn't work without
a network.
         }
@@ -1850,9 +1853,12 @@
         } else {
             allowedActions.push("edit");
 
+            allowedActions.push("copyISO");
+            /*
             if(g_regionsecondaryenabled != true) {
                 allowedActions.push("copyISO");
 			}
+			*/
         }
 
         // "Create VM"


Mime
View raw message