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

Fix returning encoded None library folder parent ids in library_contents API; thanks to nsoranzo

Browse Source
This commit is contained in:
Dannon Baker
2015-02-25 15:09:39 -05:00
parent b89a5be319
commit 8cea3c0b0e
1 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/webapps/galaxy/api/library_contents.py
+2 -1
View File
@@ -128,7 +128,8 @@ class LibraryContentsController( BaseAPIController, UsesLibraryMixin, UsesLibrar
content = self.get_library_folder( trans, content_id, check_ownership=False, check_accessible=True )
rval = content.to_dict( view='element', value_mapper={ 'id': trans.security.encode_id } )
rval[ 'id' ] = 'F' + str( rval[ 'id' ] )
rval[ 'parent_id' ] = 'F' + str( trans.security.encode_id( rval[ 'parent_id' ] ) )
if rval[ 'parent_id' ] is not None: # This can happen for root folders.
rval[ 'parent_id' ] = 'F' + str( trans.security.encode_id( rval[ 'parent_id' ] ) )
rval[ 'parent_library_id' ] = trans.security.encode_id( rval[ 'parent_library_id' ] )
else:
content = self.get_library_dataset( trans, content_id, check_ownership=False, check_accessible=True )