Repository: cloudstack
Updated Branches:
refs/heads/4.5 775e4d34c -> 744c1a1b0
CLOUDSTACK-7383: UI > Instances menu > detail view > TakeSnapshot action should be hidden when VM's 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/744c1a1b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/744c1a1b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/744c1a1b
Branch: refs/heads/4.5
Commit: 744c1a1b03c5485dc51c4b85c7c22052f6e23934
Parents: 775e4d3
Author: Jessica Wang <je...@apache.org>
Authored: Fri Jan 2 14:06:28 2015 -0800
Committer: Jessica Wang <je...@apache.org>
Committed: Fri Jan 2 14:06:28 2015 -0800
----------------------------------------------------------------------
ui/scripts/instances.js | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/744c1a1b/ui/scripts/instances.js
----------------------------------------------------------------------
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 2674804..4ff1bff 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2265,7 +2265,7 @@
allowedActions.push("restart");
if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
- || (jsonObj.hypervisor != 'LXC')) {
+ && (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
}
@@ -2299,7 +2299,7 @@
allowedActions.push("reinstall");
if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
- || (jsonObj.hypervisor != 'LXC')) {
+ && (jsonObj.hypervisor != 'LXC')) {
allowedActions.push("snapshot");
}