Repository: cloudstack Updated Branches: refs/heads/master b64fa34ce -> 7fe1ed9dc
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/7fe1ed9d Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/7fe1ed9d Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/7fe1ed9d Branch: refs/heads/master Commit: 7fe1ed9dc81a92312cb273dc464d5f6d4259af05 Parents: b64fa34 Author: Jessica Wang <jessicaw...@apache.org> Authored: Fri Jan 2 14:06:28 2015 -0800 Committer: Jessica Wang <jessicaw...@apache.org> Committed: Fri Jan 2 14:12:15 2015 -0800 ---------------------------------------------------------------------- ui/scripts/instances.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/7fe1ed9d/ui/scripts/instances.js ---------------------------------------------------------------------- diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index d439c66..9ed0e16 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -2435,7 +2435,7 @@ allowedActions.push("restart"); if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) - || (jsonObj.hypervisor != 'LXC')) { + && (jsonObj.hypervisor != 'LXC')) { allowedActions.push("snapshot"); } @@ -2469,7 +2469,7 @@ allowedActions.push("reinstall"); if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) - || (jsonObj.hypervisor != 'LXC')) { + && (jsonObj.hypervisor != 'LXC')) { allowedActions.push("snapshot"); }