opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/release_18.01' into dev

Browse Source
This commit is contained in:
Martin Cech
2018-04-25 13:10:49 -04:00
parent 1624b6ce7d 20e9934bc5
commit c1e5fb8290
1 changed files with 4 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/grouping.py
+4 -1
View File
@@ -216,7 +216,10 @@ class UploadDataset(Group):
if dataset_name is None:
filenames = list()
for composite_file in context.get('files', []):
filenames.append(composite_file.get('file_data', {}).get('filename', ''))
if not composite_file.get('ftp_files', ''):
filenames.append(composite_file.get('file_data', {}).get('filename', ''))
else:
filenames.append(composite_file.get('ftp_files', [])[0])
dataset_name = os.path.commonprefix(filenames).rstrip('.') or None
if dataset_name is None:
dataset_name = 'Uploaded Composite Dataset (%s)' % self.get_file_type(context)