# HG changeset patch -- Bitbucket.org
# Project galaxy-dist
# URL http://bitbucket.org/galaxy/galaxy-dist/overview
# User rc
# Date 1289178573 18000
# Node ID 74620fac33c74b60c0a2faa69364dea0115e8815
# Parent 328b57b1e2e53cbc9ab208379cdd3dc0864f3cc4
bug fix caused by the prev commit.
--- a/lib/galaxy/web/controllers/requests_admin.py
+++ b/lib/galaxy/web/controllers/requests_admin.py
@@ -664,6 +664,8 @@ class RequestsAdmin( BaseController, Use
if not err_msg:
message = "%i datasets have been queued for transfer from the sequencer. Click the Refresh button above to monitor the transfer status." % len( selected_sample_datasets )
status = "done"
+ else:
+ status = 'error'
return trans.response.send_redirect( web.url_for( controller='requests_admin',
action='manage_datasets',
sample_id=trans.security.encode_id( sample.id ),
# HG changeset patch -- Bitbucket.org
# Project galaxy-dist
# URL http://bitbucket.org/galaxy/galaxy-dist/overview
# User Nate Coraor <nate(a)bx.psu.edu>
# Date 1288978480 14400
# Node ID 9545e8675a5d43408d75c66fcf3115cbdaf4af8a
# Parent 7e9ae46051057d822aff82a9b1f3aec0200086f2
Fix uploads when ftp_file is not defined.
--- a/lib/galaxy/tools/parameters/grouping.py
+++ b/lib/galaxy/tools/parameters/grouping.py
@@ -287,7 +287,7 @@ class UploadDataset( Group ):
rval.append( file_bunch )
# look for files uploaded via FTP
valid_files = []
- if ftp_files:
+ if ftp_files is not None:
if trans.user is None:
log.warning( 'Anonymous user passed values in ftp_files: %s' % ftp_files )
ftp_files = []
@@ -299,6 +299,8 @@ class UploadDataset( Group ):
path = relpath( os.path.join( dirpath, filename ), user_ftp_dir )
if not os.path.islink( os.path.join( dirpath, filename ) ):
valid_files.append( path )
+ else:
+ ftp_files = []
for ftp_file in ftp_files:
if ftp_file not in valid_files:
log.warning( 'User passed an invalid file path in ftp_files: %s' % ftp_file )