Return-Path: X-Original-To: apmail-cloudstack-commits-archive@www.apache.org Delivered-To: apmail-cloudstack-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 9DA03104A3 for ; Tue, 6 Jan 2015 15:33:15 +0000 (UTC) Received: (qmail 83733 invoked by uid 500); 6 Jan 2015 15:33:16 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 83591 invoked by uid 500); 6 Jan 2015 15:33:16 -0000 Mailing-List: contact commits-help@cloudstack.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@cloudstack.apache.org Delivered-To: mailing list commits@cloudstack.apache.org Received: (qmail 83309 invoked by uid 99); 6 Jan 2015 15:33:16 -0000 Received: from tyr.zones.apache.org (HELO tyr.zones.apache.org) (140.211.11.114) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 06 Jan 2015 15:33:16 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id E70BA9215B2; Tue, 6 Jan 2015 15:33:15 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: sateesh@apache.org To: commits@cloudstack.apache.org Date: Tue, 06 Jan 2015 15:33:19 -0000 Message-Id: In-Reply-To: <389c2a5cdd1f4d088dc4eab71e0c28f6@git.apache.org> References: <389c2a5cdd1f4d088dc4eab71e0c28f6@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [05/25] git commit: updated refs/heads/vmware-disk-controllers to e8a54f4 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/vmware-disk-controllers Commit: 7fe1ed9dc81a92312cb273dc464d5f6d4259af05 Parents: b64fa34 Author: Jessica Wang Authored: Fri Jan 2 14:06:28 2015 -0800 Committer: Jessica Wang 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"); }