You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by je...@apache.org on 2013/12/23 20:34:41 UTC

git commit: updated refs/heads/master to 1e0ed7d

Updated Branches:
  refs/heads/master 2868f36db -> 1e0ed7d5f


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/1e0ed7d5
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/1e0ed7d5
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/1e0ed7d5

Branch: refs/heads/master
Commit: 1e0ed7d5f8537a6b307fffb7a931be3e7de35050
Parents: 2868f36
Author: Jessica Wang <je...@apache.org>
Authored: Mon Dec 23 11:33:39 2013 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Mon Dec 23 11:34:30 2013 -0800

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


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1e0ed7d5/ui/scripts/templates.js
----------------------------------------------------------------------
diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js
index 3854db7..0f8f115 100644
--- a/ui/scripts/templates.js
+++ b/ui/scripts/templates.js
@@ -1826,9 +1826,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.
         }
@@ -1864,9 +1867,12 @@
         } else {
             allowedActions.push("edit");
 
+            allowedActions.push("copyISO");
+            /*
             if(g_regionsecondaryenabled != true) {
                 allowedActions.push("copyISO");
 			}
+			*/
         }
 
         // "Create VM"