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

galaxyproject · Apr 25, 2018 · c1e5fb8 · c1e5fb8
2 parents 1624b6c + 20e9934
commit c1e5fb8
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/lib/galaxy/tools/parameters/grouping.py b/lib/galaxy/tools/parameters/grouping.py
@@ -216,7 +216,10 @@ def get_composite_dataset_name(self, context):
         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)