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

Merged in jmchilton/galaxy-central-fork-1/stable (pull request #415)

Browse Source 
[stable] API bug fixes for stable
This commit is contained in:
Nate Coraor
2014-06-12 08:50:00 -04:00
parent fef3980f75 a8c2a879f0
commit 48fc6114ad
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/api/history_contents.py
+1 -1
View File
@@ -143,7 +143,7 @@ class HistoryContentsController( BaseAPIController, UsesHistoryDatasetAssociatio
'purged': hda.purged,
'hid' : hda.hid,
'history_content_type' : hda.history_content_type,
'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id, type="dataset" ),
'url' : url_for( 'history_content', history_id=encoded_history_id, id=encoded_id ),
}
def __collection_dict( self, trans, dataset_collection_instance, view="collection" ):
lib/galaxy/webapps/galaxy/api/tools.py
+1 -1
View File
@@ -156,7 +156,7 @@ class ToolsController( BaseAPIController, UsesVisualizationMixin, UsesHistoryMix
output_dict[ 'output_name' ] = output_name
outputs.append( trans.security.encode_dict_ids( output_dict ) )
for job in vars[ 'jobs' ]:
for job in vars.get('jobs', []):
rval[ 'jobs' ].append( self.encode_all_ids( trans, job.to_dict( view='collection' ), recursive=True ) )
for output_name, collection_instance in vars.get( 'implicit_collections', {} ).iteritems():