1 new changeset in galaxy-central:

http://bitbucket.org/galaxy/galaxy-central/changeset/29e9f87731ec/ changeset: 29e9f87731ec user: greg date: 2011-09-20 17:17:27 summary: Tweak tool shed cookie handling. affected #: 2 files (-1 bytes)

--- a/lib/galaxy/web/base/controller.py Tue Sep 20 10:45:23 2011 -0400 +++ b/lib/galaxy/web/base/controller.py Tue Sep 20 11:17:27 2011 -0400 @@ -2751,9 +2751,7 @@ def browse_tool_shed( self, trans, **kwd ): tool_shed_url = kwd[ 'tool_shed_url' ] galaxy_url = trans.request.host - # Set the galayurl cookie so we can get back here from the remote tool shed. - trans.set_cookie( galaxy_url, name='toolshedgalaxyurl' ) - url = '%s/repository/browse_downloadable_repositories?webapp=community' % ( tool_shed_url ) + url = '%s/repository/browse_downloadable_repositories?galaxy_url=%s&webapp=community' % ( tool_shed_url, galaxy_url ) return trans.response.send_redirect( url ) @web.expose @web.require_admin

--- a/lib/galaxy/webapps/community/controllers/repository.py Tue Sep 20 10:45:23 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Tue Sep 20 11:17:27 2011 -0400 @@ -262,6 +262,11 @@ return self.category_list_grid( trans, **kwd ) @web.expose def browse_downloadable_repositories( self, trans, **kwd ): + # Set the toolshedgalaxyurl cookie so we can get back + # to the calling local Galaxy instance. + galaxy_url = kwd.get( 'galaxy_url', None ) + if galaxy_url: + trans.set_cookie( galaxy_url, name='toolshedgalaxyurl' ) repository_id = kwd.get( 'id', None ) if 'operation' in kwd: operation = kwd[ 'operation' ].lower()

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.