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 70D1E10331 for ; Mon, 19 Jan 2015 19:36:05 +0000 (UTC) Received: (qmail 43587 invoked by uid 500); 19 Jan 2015 19:36:02 -0000 Delivered-To: apmail-cloudstack-commits-archive@cloudstack.apache.org Received: (qmail 43437 invoked by uid 500); 19 Jan 2015 19:36:02 -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 43418 invoked by uid 99); 19 Jan 2015 19:36:02 -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; Mon, 19 Jan 2015 19:36:02 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 4E0FAE03A8; Mon, 19 Jan 2015 19:36:02 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: bfederle@apache.org To: commits@cloudstack.apache.org Date: Mon, 19 Jan 2015 19:36:03 -0000 Message-Id: <5d4fc7271abd4f239b87b1e10bf09cc1@git.apache.org> In-Reply-To: References: X-Mailer: ASF-Git Admin Mailer Subject: [2/2] git commit: updated refs/heads/volume-upload to e4d1049 Add to storage->upload volume dialog Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/8641de85 Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/8641de85 Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/8641de85 Branch: refs/heads/volume-upload Commit: 8641de85d2da4d755cfe966ea5c6c3aaf4abc2b5 Parents: ad6b7b3 Author: Brian Federle Authored: Mon Jan 19 11:33:59 2015 -0800 Committer: Brian Federle Committed: Mon Jan 19 11:35:42 2015 -0800 ---------------------------------------------------------------------- ui/scripts/storage.js | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/8641de85/ui/scripts/storage.js ---------------------------------------------------------------------- diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 6585e1a..663fb9f 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -265,6 +265,22 @@ } }, createForm: { + fileUpload: { + getURL: function(args) { + args.response.success({ + url: 'http://10.223.183.3/test-upload.php' + }); + }, + postUpload: function(args) { + // Called when upload is done to do + // verification checks; + // i.e., poll the server to verify successful upload + // + // success() will close the dialog and call standard action + // error() will keep dialog open if user wants to re-submit + args.response.success(); + } + }, title: 'label.upload.volume', fields: { name: { @@ -274,6 +290,10 @@ }, docID: 'helpUploadVolumeName' }, + templateFileUpload: { + label: 'Select a file', + isFileUpload: true + }, availabilityZone: { label: 'label.availability.zone', docID: 'helpUploadVolumeZone',