commit/galaxy-central: natefoo: 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.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/94688ff06248/ changeset: 94688ff06248 user: natefoo date: 2011-08-22 20:47:10 summary: 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. affected #: 1 file (84 bytes) --- a/lib/galaxy/tools/parameters/basic.py Mon Aug 22 14:03:57 2011 -0400 +++ b/lib/galaxy/tools/parameters/basic.py Mon Aug 22 14:47:10 2011 -0400 @@ -454,7 +454,11 @@ 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 Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
Bitbucket