2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/030db20e2f4f/ Changeset: 030db20e2f4f Branch: stable User: carlfeberhard Date: 2014-12-08 21:47:33+00:00 Summary: Fix to 04a072e: use proper mako dict method instead of printing json string Affected #: 1 file diff -r 374e94196a14673993540a60d446addc6b1780a0 -r 030db20e2f4f15d63f622ccdd224d65214cb8d7a templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -1,4 +1,4 @@ -<%namespace file="/galaxy_client_app.mako" import="get_user_json" /> +<%namespace file="/galaxy_client_app.mako" import="get_user_dict" /> ## masthead head generator <%def name="load(active_view = None)"> @@ -34,7 +34,7 @@ 'requests' : bool(trans.user and (trans.user.requests or trans.app.security_agent.get_accessible_request_types(trans, trans.user))), 'email' : trans.user.email if (trans.user) else "", 'valid' : bool(trans.user != None), - 'json' : get_user_json() + 'json' : get_user_dict() } } %> https://bitbucket.org/galaxy/galaxy-central/commits/782cf1a1f6b5/ Changeset: 782cf1a1f6b5 Branch: stable User: dannon Date: 2014-12-08 22:06:25+00:00 Summary: Merged in carlfeberhard/carlfeberhard-galaxy-central-stable/stable (pull request #600) [STABLE] Fix to 04a072e to use the correct mako method in the masthead. Affected #: 1 file diff -r 07404a82972d877b5529fffaeb3e7e05b69a02a3 -r 782cf1a1f6b56f8a9c0b3e5e9ffd29fd93b16ce3 templates/webapps/galaxy/galaxy.masthead.mako --- a/templates/webapps/galaxy/galaxy.masthead.mako +++ b/templates/webapps/galaxy/galaxy.masthead.mako @@ -1,4 +1,4 @@ -<%namespace file="/galaxy_client_app.mako" import="get_user_json" /> +<%namespace file="/galaxy_client_app.mako" import="get_user_dict" /> ## masthead head generator <%def name="load(active_view = None)"> @@ -34,7 +34,7 @@ 'requests' : bool(trans.user and (trans.user.requests or trans.app.security_agent.get_accessible_request_types(trans, trans.user))), 'email' : trans.user.email if (trans.user) else "", 'valid' : bool(trans.user != None), - 'json' : get_user_json() + 'json' : get_user_dict() } } %> 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.