Enhance to_json such that it can be safely called multiple times

galaxyproject · Apr 19, 2016 · cc49110 · cc49110
1 parent 212f7f4
commit cc49110
Showing 1 changed file with 6 additions and 3 deletions.
diff --git a/lib/galaxy/tools/parameters/basic.py b/lib/galaxy/tools/parameters/basic.py
@@ -1673,13 +1673,16 @@ def _parse_options( self, input_source ):
     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: