opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-10-29 17:42:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

Modifications to history_contents API and client consumption...

Browse Source 
... to reflect the fact that history can now contain two kinds of objects with potentially overlapping ids.
This commit is contained in:
John Chilton
2014-06-13 14:25:36 -05:00
parent e096ba008b
commit b513c3cc1d
2 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/api/history_contents.py
+4 -2
View File
@@ -102,8 +102,10 @@ class HistoryContentsController( BaseAPIController, UsesHistoryDatasetAssociatio
contents_kwds[ 'deleted' ] = kwd.get( 'deleted', None )
contents_kwds[ 'visible' ] = kwd.get( 'visible', None )
# details param allows a mixed set of summary and detailed hdas
#TODO: this is getting convoluted due to backwards compat
details = kwd.get( 'details', None ) or []
# Ever more convoluted due to backwards compat..., details
# should be considered deprecated in favor of more specific
# dataset_details (and to be implemented dataset_collection_details).
details = kwd.get( 'details', None ) or kwd.get( 'dataset_details', None ) or []
if details and details != 'all':
details = util.listify( details )