2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/cecfc6a07661/ Changeset: cecfc6a07661 User: dan Date: 2013-05-08 20:37:33 Summary: Fix for incorrect template inheritance causing the tool shed base_panels to be displayed in the galaxy app when logging in after logout. Affected #: 1 file diff -r bc3f20c535f780dec3d6d33c3e98a1fe4df4764e -r cecfc6a076619fc54ab99e74425cb7fe7714f36c templates/user/login.mako --- a/templates/user/login.mako +++ b/templates/user/login.mako @@ -1,20 +1,13 @@ -%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 +<%! +#This is a hack, we should restructure templates to avoid this. +def inherit(context): + if context.get('trans').webapp.name == 'galaxy': + return '/webapps/galaxy/base_panels.mako' + elif context.get('trans').webapp.name == 'tool_shed': + return '/webapps/tool_shed/base_panels.mako' + else: + return '/base.mako' +%><%inherit file="${inherit(context)}"/> https://bitbucket.org/galaxy/galaxy-central/commits/4590977323e7/ Changeset: 4590977323e7 Branch: stable User: dan Date: 2013-05-08 20:37:33 Summary: Fix for incorrect template inheritance causing the tool shed base_panels to be displayed in the galaxy app when logging in after logout. Affected #: 1 file diff -r 0899ad383fba01c78077a3dfddb954bebaf6e72e -r 4590977323e76d9448c29c5fdb25f2bb7c500229 templates/user/login.mako --- a/templates/user/login.mako +++ b/templates/user/login.mako @@ -1,20 +1,13 @@ -%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 +<%! +#This is a hack, we should restructure templates to avoid this. +def inherit(context): + if context.get('trans').webapp.name == 'galaxy': + return '/webapps/galaxy/base_panels.mako' + elif context.get('trans').webapp.name == 'tool_shed': + return '/webapps/tool_shed/base_panels.mako' + else: + return '/base.mako' +%><%inherit file="${inherit(context)}"/> 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.