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 85EF810434 for ; Tue, 12 Nov 2013 19:42:00 +0000 (UTC) Received: (qmail 29468 invoked by uid 500); 12 Nov 2013 19:42:00 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 29443 invoked by uid 500); 12 Nov 2013 19:42:00 -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 29436 invoked by uid 99); 12 Nov 2013 19:42:00 -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, 12 Nov 2013 19:42:00 +0000 Received: by tyr.zones.apache.org (Postfix, from userid 65534) id 308B68236AD; Tue, 12 Nov 2013 19:42:00 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: jessicawang@apache.org To: commits@cloudstack.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: git commit: updated refs/heads/master to 5d41d79 Date: Tue, 12 Nov 2013 19:42:00 +0000 (UTC) Updated Branches: refs/heads/master 9f8f74c4e -> 5d41d7980 CLOUDSTACK-4428: UI > volume page > when hypervisor is KVM and kvm.snapshot.enabled is false, still show Take Snapshot on a detached volume. Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/5d41d798 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/5d41d798 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/5d41d798 Branch: refs/heads/master Commit: 5d41d79802d86256d172276a1b7501cc9f016eb7 Parents: 9f8f74c Author: Jessica Wang Authored: Tue Nov 12 11:33:39 2013 -0800 Committer: Jessica Wang Committed: Tue Nov 12 11:41:50 2013 -0800 ---------------------------------------------------------------------- ui/scripts/storage.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5d41d798/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 314621e..22330e8 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -1900,7 +1900,7 @@ allowedActions.push("takeSnapshot"); allowedActions.push("recurringSnapshot"); } else { - if(jsonObj.vmstate == 'Stopped') { + if(jsonObj.vmstate == 'Stopped' || jsonObj.virtualmachineid == undefined) { //volume of stopped VM, or detached volume allowedActions.push("takeSnapshot"); } }