1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/ef4980977585/ changeset: ef4980977585 user: smcmanus date: 2012-10-18 04:55:00 summary: Fixed minor issue with folder API's routing. affected #: 3 files diff -r 4c5297ac9919dd00bb08399131f7adb5892a8891 -r ef498097758501bb1d174eaebeca1f11f9251360 lib/galaxy/webapps/galaxy/api/folder_contents.py --- a/lib/galaxy/webapps/galaxy/api/folder_contents.py +++ b/lib/galaxy/webapps/galaxy/api/folder_contents.py @@ -70,9 +70,7 @@ rval.append( dict( id = encoded_id, type = content.api_type, name = content.name, - # TODO: calculate the folder's library id - # (if necessary) and add library_id=X below: - url = url_for( controller='folder_content', id=encoded_id ) ) ) + url = url_for( 'folder_contents', folder_id=encoded_id ) ) ) return rval @web.expose_api diff -r 4c5297ac9919dd00bb08399131f7adb5892a8891 -r ef498097758501bb1d174eaebeca1f11f9251360 lib/galaxy/webapps/galaxy/buildapp.py --- a/lib/galaxy/webapps/galaxy/buildapp.py +++ b/lib/galaxy/webapps/galaxy/buildapp.py @@ -62,13 +62,12 @@ webapp.add_api_controllers( 'galaxy.webapps.galaxy.api', app ) # The /folders section is experimental at this point: log.debug( "app.config.api_folders: %s" % app.config.api_folders ) - if app.config.api_folders: - webapp.api_mapper.resource( 'folder', 'folders', path_prefix='/api' ) - webapp.api_mapper.resource( 'content', 'contents', - controller='folder_contents', - name_prefix='folder_', - path_prefix='/api/folders/:folder_id', - parent_resources=dict( member_name='folder', collection_name='folders' ) ) + webapp.api_mapper.resource( 'folder', 'folders', path_prefix='/api' ) + webapp.api_mapper.resource( 'content', 'contents', + controller='folder_contents', + name_prefix='folder_', + path_prefix='/api/folders/:folder_id', + parent_resources=dict( member_name='folder', collection_name='folders' ) ) webapp.api_mapper.resource( 'content', 'contents', controller='library_contents', diff -r 4c5297ac9919dd00bb08399131f7adb5892a8891 -r ef498097758501bb1d174eaebeca1f11f9251360 lib/galaxy/webapps/galaxy/controllers/library_common.py --- a/lib/galaxy/webapps/galaxy/controllers/library_common.py +++ b/lib/galaxy/webapps/galaxy/controllers/library_common.py @@ -130,7 +130,6 @@ status = "info" comptypes = get_comptypes( trans ) try: - # SM: TODO: Add configuration variable asap. if self.app.config.new_lib_browse: pass else: Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.