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 pull request #2196 from guerler/extend_to_json_000

Browse Source 
[16.04] Extend to_json for dataset tool parameters
This commit is contained in:
John Chilton
2016-04-20 10:15:53 -04:00
parent eac0fb9b26 cc49110190
commit 4ea53d99aa
1 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+6 -3
View File
@@ -1673,13 +1673,16 @@ class BaseDataToolParameter( ToolParameter ):
def to_json( self, value, app ):
def single_to_json( value ):
src = None
if isinstance( value, galaxy.model.DatasetCollectionElement ):
if isinstance( value, dict ) and 'src' in value and 'id' in value:
return value
elif isinstance( value, galaxy.model.DatasetCollectionElement ):
src = 'dce'
elif isinstance( value, app.model.HistoryDatasetCollectionAssociation ):
src = 'hdca'
else:
elif hasattr( value, 'id' ):
src = 'hda'
return { 'id' : app.security.encode_id( value.id ), 'src' : src }
if src is not None:
return { 'id' : app.security.encode_id( value.id ), 'src' : src }
if value not in [ None, '', 'None' ]:
if isinstance( value, list ) and len( value ) > 0: