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 7716E1809A for ; Sat, 19 Sep 2015 01:31:14 +0000 (UTC) Received: (qmail 82713 invoked by uid 500); 19 Sep 2015 01:31:08 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 82642 invoked by uid 500); 19 Sep 2015 01:31:08 -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 81135 invoked by uid 99); 19 Sep 2015 01:31:07 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Sat, 19 Sep 2015 01:31:07 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 7A639E1105; Sat, 19 Sep 2015 01:31:07 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: mtutkowski@apache.org To: commits@cloudstack.apache.org Date: Sat, 19 Sep 2015 01:31:27 -0000 Message-Id: In-Reply-To: <1ba3cd7f4a18434d91b25d563b872cbb@git.apache.org> References: <1ba3cd7f4a18434d91b25d563b872cbb@git.apache.org> X-Mailer: ASF-Git Admin Mailer Subject: [21/50] git commit: updated refs/heads/sf-plugins to 157efc3 Improvements to delete-volume logic Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/74ae95fa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/74ae95fa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/74ae95fa Branch: refs/heads/sf-plugins Commit: 74ae95facdd93eb3bb7ddb70e051c923293ae154 Parents: cb933f2 Author: Mike Tutkowski Authored: Thu Jul 9 17:31:46 2015 -0600 Committer: Mike Tutkowski Committed: Fri Sep 18 19:28:20 2015 -0600 ---------------------------------------------------------------------- ui/plugins/sfSharedVolume/sfSharedVolume.js | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/74ae95fa/ui/plugins/sfSharedVolume/sfSharedVolume.js ---------------------------------------------------------------------- diff --git a/ui/plugins/sfSharedVolume/sfSharedVolume.js b/ui/plugins/sfSharedVolume/sfSharedVolume.js index c37d9c3..b43b221 100644 --- a/ui/plugins/sfSharedVolume/sfSharedVolume.js +++ b/ui/plugins/sfSharedVolume/sfSharedVolume.js @@ -157,8 +157,8 @@ }, dependsOn: ['availabilityZone', 'account'], select: function(args) { - if (args.data.availabilityZone === null || args.data.availabilityZone === "" || - args.data.account === null || args.data.account === "") { + if (args.data.availabilityZone == null || args.data.availabilityZone == "" || + args.data.account == null || args.data.account == "") { return; } @@ -214,31 +214,22 @@ }, detailView: { name: 'label.volume.details', - viewAll: { - path: 'storage.snapshots', - label: 'label.snapshots' - }, actions: { - deleteVolume: { + remove: { label: 'Delete Shared Volume', messages: { confirm: function(args) { return 'Are you sure you would like to delete this shared volume?'; }, notification: function(args) { - return 'Shared volume deleted'; + return 'Delete Shared Volume'; } }, action: function(args) { $.ajax({ - url: createURL('deleteSolidFireVolume'), - data: data, + url: createURL('deleteSolidFireVolume&id=' + args.context.sfSharedVolumes[0].id), success: function(json) { - var sfvolumeObj = json.deletesolidfirevolumeresponse.apideletesolidfirevolume; - - args.response.success({ - data: sfvolumeObj - }); + args.response.success(); }, error: function(json) { args.response.error(parseXMLHttpResponse(json));