2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/56de0ee7932f/ Changeset: 56de0ee7932f Branch: next-stable User: inithello Date: 2013-03-29 14:30:36 Summary: Fix for server error when logging out of the tool shed. Affected #: 3 files diff -r 9722c83fab8bc5c67da5d60fe8507e2496ee69c2 -r 56de0ee7932f5097855dcb54a2393ce86e8b7c15 lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -726,8 +726,11 @@ other_galaxy_session.is_valid = False self.sa_session.add( other_galaxy_session ) self.sa_session.flush() - # This method is not called from the Galaxy reports, so the cookie will always be galaxysession - self.__update_session_cookie( name='galaxysession' ) + if self.webapp.name == 'galaxy': + # This method is not called from the Galaxy reports, so the cookie will always be galaxysession + self.__update_session_cookie( name='galaxysession' ) + elif self.webapp.name == 'tool_shed': + self.__update_session_cookie( name='galaxycommunitysession' ) def get_galaxy_session( self ): """ Return the current galaxy session diff -r 9722c83fab8bc5c67da5d60fe8507e2496ee69c2 -r 56de0ee7932f5097855dcb54a2393ce86e8b7c15 templates/user/login.mako --- a/templates/user/login.mako +++ b/templates/user/login.mako @@ -1,10 +1,21 @@ -<%! - def inherit(context): - if context.get('use_panels'): - return '/webapps/galaxy/base_panels.mako' - else: - return '/base.mako' -%> +%if trans.webapp.name == 'galaxy': + <%! + def inherit(context): + if context.get('use_panels'): + return '/webapps/galaxy/base_panels.mako' + else: + return '/base.mako' + %> +%elif trans.webapp.name == 'tool_shed': + <%! + def inherit(context): + if context.get('use_panels'): + return '/webapps/tool_shed/base_panels.mako' + else: + return '/base.mako' + %> +%endif + <%inherit file="${inherit(context)}"/><%def name="init()"> diff -r 9722c83fab8bc5c67da5d60fe8507e2496ee69c2 -r 56de0ee7932f5097855dcb54a2393ce86e8b7c15 templates/user/logout.mako --- a/templates/user/logout.mako +++ b/templates/user/logout.mako @@ -1,7 +1,11 @@ -<%inherit file="/webapps/galaxy/base_panels.mako"/> +%if trans.webapp.name == 'galaxy': + <%inherit file="/webapps/galaxy/base_panels.mako"/> +%elif trans.webapp.name == 'tool_shed': + <%inherit file="/webapps/tool_shed/base_panels.mako"/> +%endif + <%namespace file="/message.mako" import="render_msg" /> - <%def name="init()"><% self.has_left_panel=False https://bitbucket.org/galaxy/galaxy-central/commits/5a3199174e53/ Changeset: 5a3199174e53 User: inithello Date: 2013-03-29 14:31:59 Summary: Merged in next-stable. Affected #: 3 files diff -r b97103653cb622defbc20ae222f04bf145083791 -r 5a3199174e53443cc85626dad7192077e52daeef lib/galaxy/web/framework/__init__.py --- a/lib/galaxy/web/framework/__init__.py +++ b/lib/galaxy/web/framework/__init__.py @@ -726,8 +726,11 @@ other_galaxy_session.is_valid = False self.sa_session.add( other_galaxy_session ) self.sa_session.flush() - # This method is not called from the Galaxy reports, so the cookie will always be galaxysession - self.__update_session_cookie( name='galaxysession' ) + if self.webapp.name == 'galaxy': + # This method is not called from the Galaxy reports, so the cookie will always be galaxysession + self.__update_session_cookie( name='galaxysession' ) + elif self.webapp.name == 'tool_shed': + self.__update_session_cookie( name='galaxycommunitysession' ) def get_galaxy_session( self ): """ Return the current galaxy session diff -r b97103653cb622defbc20ae222f04bf145083791 -r 5a3199174e53443cc85626dad7192077e52daeef templates/user/login.mako --- a/templates/user/login.mako +++ b/templates/user/login.mako @@ -1,10 +1,21 @@ -<%! - def inherit(context): - if context.get('use_panels'): - return '/webapps/galaxy/base_panels.mako' - else: - return '/base.mako' -%> +%if trans.webapp.name == 'galaxy': + <%! + def inherit(context): + if context.get('use_panels'): + return '/webapps/galaxy/base_panels.mako' + else: + return '/base.mako' + %> +%elif trans.webapp.name == 'tool_shed': + <%! + def inherit(context): + if context.get('use_panels'): + return '/webapps/tool_shed/base_panels.mako' + else: + return '/base.mako' + %> +%endif + <%inherit file="${inherit(context)}"/><%def name="init()"> diff -r b97103653cb622defbc20ae222f04bf145083791 -r 5a3199174e53443cc85626dad7192077e52daeef templates/user/logout.mako --- a/templates/user/logout.mako +++ b/templates/user/logout.mako @@ -1,7 +1,11 @@ -<%inherit file="/webapps/galaxy/base_panels.mako"/> +%if trans.webapp.name == 'galaxy': + <%inherit file="/webapps/galaxy/base_panels.mako"/> +%elif trans.webapp.name == 'tool_shed': + <%inherit file="/webapps/tool_shed/base_panels.mako"/> +%endif + <%namespace file="/message.mako" import="render_msg" /> - <%def name="init()"><% self.has_left_panel=False 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.