From cdd29d17818950a5c4434594e0b771dfd4fd0885 Mon Sep 17 00:00:00 2001 From: Nate Coraor Date: Mon, 22 Aug 2011 14:47:10 -0400 Subject: [PATCH] Fix FTP upload when uploading only a single file and its name contains a comma. util.listify assumes that a string with commas should be split into a list, so don't use listify for this value. Thanks Ilya Chorny. --- lib/galaxy/tools/parameters/basic.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py index c02a0346edb..8d298a68ea0 100644 --- a/lib/galaxy/tools/parameters/basic.py +++ b/lib/galaxy/tools/parameters/basic.py @@ -454,7 +454,11 @@ class FTPFileToolParameter( ToolParameter ): user_ftp_dir = os.path.join( trans.app.config.ftp_upload_dir, trans.user.email ) return form_builder.FTPFileField( self.name, user_ftp_dir, trans.app.config.ftp_upload_site, value = value ) def from_html( self, value, trans=None, other_values={} ): - return util.listify( value ) + try: + assert type( value ) is list + except: + value = [ value ] + return value def to_string( self, value, app ): if value in [ None, '' ]: return None