commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/564f28960281/ Changeset: 564f28960281 User: dannon Date: 2013-06-18 14:59:17 Summary: Fix tool panel rendering user requirement logic. Affected #: 1 file diff -r d2d4b6ac2139f1623301990462a5e63b2952dcc1 -r 564f289602814adae34ec716c18a2d9ea0ebf1ff templates/webapps/galaxy/root/tool_menu.mako --- a/templates/webapps/galaxy/root/tool_menu.mako +++ b/templates/webapps/galaxy/root/tool_menu.mako @@ -29,7 +29,7 @@ Galaxy.toolPanel = tool_panel; ## Populate tool panel if (a) anonymous use possible or (b) user is logged in. - %if trans.app.config.require_login and trans.user: + %if trans.user or not trans.app.config.require_login: tool_panel.reset( tool_panel.parse( ${h.to_json_string( trans.app.toolbox.to_dict( trans ) )} ) ); %endif @@ -90,4 +90,4 @@ </div></div> -</%def> \ No newline at end of file +</%def> https://bitbucket.org/galaxy/galaxy-central/commits/7a6bc7485be9/ Changeset: 7a6bc7485be9 User: dannon Date: 2013-06-18 15:01:15 Summary: Merge Affected #: 1 file diff -r 564f289602814adae34ec716c18a2d9ea0ebf1ff -r 7a6bc7485be9da1b07ac5bf8d9d62dcff327b5ba templates/refresh_frames.mako --- a/templates/refresh_frames.mako +++ b/templates/refresh_frames.mako @@ -1,9 +1,10 @@ ## Include JavaScript code to refresh Galaxy application frames as needed. <%def name="handle_refresh_frames()"> - <script type="text/javascript"><% if not refresh_frames: return %> + + <script type="text/javascript"> %if 'everything' in refresh_frames: parent.location.href="${h.url_for( controller='root' )}"; %endif 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.
participants (1)
-
commits-noreply@bitbucket.org