You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by ra...@apache.org on 2014/11/05 11:45:39 UTC
[45/50] [abbrv] git commit: updated refs/heads/master to 4c5f792
CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide this option when hypervisor is LXC.
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/a43fba64
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/a43fba64
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/a43fba64
Branch: refs/heads/master
Commit: a43fba64dacb55da6dedf6140beb5f692a486e61
Parents: 25e514a
Author: Jessica Wang <je...@apache.org>
Authored: Tue Nov 4 14:42:29 2014 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Tue Nov 4 14:42:29 2014 -0800
----------------------------------------------------------------------
ui/scripts/instances.js | 12 ++++++++++--
1 file changed, 10 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a43fba64/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 3cf5dd6..b46c343 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2248,8 +2248,12 @@
} else if (jsonObj.state == 'Running') {
allowedActions.push("stop");
allowedActions.push("restart");
- if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+
+ if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+ || (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
+ }
+
allowedActions.push("destroy");
allowedActions.push("reinstall");
@@ -2278,8 +2282,12 @@
allowedActions.push("start");
allowedActions.push("destroy");
allowedActions.push("reinstall");
- if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+
+ if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+ || (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
+ }
+
allowedActions.push("scaleUp"); //when vm is stopped, scaleUp is supported for all hypervisors
allowedActions.push("changeAffinity");