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 branch 'release_16.04' into release_16.07

Browse Source
This commit is contained in:
Dannon Baker
2016-08-12 13:34:41 -04:00
parent 4b86f6137f ceeef39edb
commit 66e725b6e3
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+2 -1
View File
@@ -2071,7 +2071,8 @@ class DataToolParameter( BaseDataToolParameter ):
if match:
m = match.hda
has_matched = has_matched or visible_hda == m or visible_hda == hda
append( d[ 'options' ][ 'hda' ], m.id, m.hid, m.name if m.visible else '(hidden) %s' % m.name, 'hda' )
m_name = '%s (as %s)' % ( match.original_hda.name, match.target_ext ) if match.implicit_conversion else m.name
append( d[ 'options' ][ 'hda' ], m.id, m.hid, m_name if m.visible else '(hidden) %s' % m_name, 'hda' )
if not has_matched and isinstance( visible_hda, trans.app.model.HistoryDatasetAssociation ):
append( d[ 'options' ][ 'hda' ], visible_hda.id, visible_hda.hid, '(unavailable) %s' % visible_hda.name, 'hda', True )