1 new commit in galaxy-central:

https://bitbucket.org/galaxy/galaxy-central/changeset/834de698004e/ changeset: 834de698004e user: greg date: 2011-11-30 15:16:37 summary: Revert 2 changes made in 5db0da0007fc in an attempt to correct the broken behavior of rendering Galaxy correctly when using apache proxying, possibly in adition to requiring users to login. affected #: 2 files

diff -r de03f821784bcbe04a7514ad3d8e43fb1b635e4b -r 834de698004e1306b4424d0a8dbd3e7c1938ee9c lib/galaxy/web/controllers/user.py --- a/lib/galaxy/web/controllers/user.py +++ b/lib/galaxy/web/controllers/user.py @@ -358,7 +358,7 @@ else: refresh_frames = [ 'masthead', 'history' ] message, status, user, success = self.__validate_login( trans, webapp, **kwd ) - if success and referer and not referer.startswith( url_for( trans.request.base + url_for( controller='user', action='logout' ) ) ): + if success and referer and not referer.startswith( trans.request.base + url_for( controller='user', action='logout' ) ): redirect_url = referer elif success: redirect_url = url_for( '/' )

diff -r de03f821784bcbe04a7514ad3d8e43fb1b635e4b -r 834de698004e1306b4424d0a8dbd3e7c1938ee9c templates/webapps/galaxy/base_panels.mako --- a/templates/webapps/galaxy/base_panels.mako +++ b/templates/webapps/galaxy/base_panels.mako @@ -142,7 +142,11 @@ menu_options.append( [ _('Preferences'), h.url_for( controller='/user', action='index', cntrller='user', webapp='galaxy' ), "galaxy_main" ] ) if app.config.get_bool( 'enable_tracks', False ): menu_options.append( [ 'Custom Builds', h.url_for( controller='/user', action='dbkeys' ), "galaxy_main" ] ) - menu_options.append( [ 'Logout', h.url_for( controller='/user', action='logout', webapp='galaxy' ), "_top" ] ) + if app.config.require_login: + logout_url = h.url_for( controller='/root', action='index', m_c='user', m_a='logout', webapp='galaxy' ) + else: + logout_url = h.url_for( controller='/user', action='logout', webapp='galaxy' ) + menu_options.append( [ 'Logout', logout_url, "_top" ] ) menu_options.append( None ) menu_options.append( [ _('Saved Histories'), h.url_for( controller='/history', action='list' ), "galaxy_main" ] ) menu_options.append( [ _('Saved Datasets'), h.url_for( controller='/dataset', action='list' ), "galaxy_main" ] )

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.