commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1d2c1d24c4f0/ Changeset: 1d2c1d24c4f0 User: davebgx Date: 2014-06-11 20:53:06 Summary: Merge stable. Affected #: 8 files diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/common/repository_actions_menu.mako --- a/templates/webapps/tool_shed/common/repository_actions_menu.mako +++ b/templates/webapps/tool_shed/common/repository_actions_menu.mako @@ -54,7 +54,7 @@ else: can_push = False - if not is_deprecated and not is_new and not is_malicious: + if not is_deprecated and not is_new and not changeset_is_malicious: can_download = True else: can_download = False diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/browse_repository.mako --- a/templates/webapps/tool_shed/repository/browse_repository.mako +++ b/templates/webapps/tool_shed/repository/browse_repository.mako @@ -31,7 +31,7 @@ can_browse_contents = not is_new %> -${render_tool_shed_repository_actions( repository, changeset_revision=changeset_revision )} +${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_revision=changeset_revision )} %if message: ${render_msg( message, status )} diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/contact_owner.mako --- a/templates/webapps/tool_shed/repository/contact_owner.mako +++ b/templates/webapps/tool_shed/repository/contact_owner.mako @@ -11,7 +11,7 @@ %><%inherit file="${inherit(context)}"/> -${render_tool_shed_repository_actions( repository )} +${render_tool_shed_repository_actions( repository, metadata=metadata )} %if message: ${render_msg( message, status )} diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/export_repository.mako --- a/templates/webapps/tool_shed/repository/export_repository.mako +++ b/templates/webapps/tool_shed/repository/export_repository.mako @@ -23,7 +23,7 @@ ${container_javascripts()} </%def> -${render_tool_shed_repository_actions( repository, changeset_revision=changeset_revision )} +${render_tool_shed_repository_actions( repository, metadata=metadata, changeset_revision=changeset_revision )} %if message: ${render_msg( message, status )} diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/view_changelog.mako --- a/templates/webapps/tool_shed/repository/view_changelog.mako +++ b/templates/webapps/tool_shed/repository/view_changelog.mako @@ -29,7 +29,7 @@ ${h.js( "libs/jquery/jquery.rating" )} </%def> -${render_tool_shed_repository_actions( repository=repository )} +${render_tool_shed_repository_actions( repository=repository, metadata=metadata )} %if message: ${render_msg( message, status )} diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/view_changeset.mako --- a/templates/webapps/tool_shed/repository/view_changeset.mako +++ b/templates/webapps/tool_shed/repository/view_changeset.mako @@ -29,7 +29,7 @@ ${h.js( "libs/jquery/jquery.rating" )} </%def> -${render_tool_shed_repository_actions( repository=repository )} +${render_tool_shed_repository_actions( repository=repository, metadata=metadata )} %if message: ${render_msg( message, status )} diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/view_repository.mako --- a/templates/webapps/tool_shed/repository/view_repository.mako +++ b/templates/webapps/tool_shed/repository/view_repository.mako @@ -61,7 +61,7 @@ </%def> %if trans.webapp.name == 'tool_shed': - ${render_tool_shed_repository_actions( repository=repository, changeset_revision=changeset_revision )} + ${render_tool_shed_repository_actions( repository=repository, metadata=metadata, changeset_revision=changeset_revision )} %else: ${render_galaxy_repository_actions( repository=repository )} %endif diff -r 61d72d2b2e6e0afb60057b7a753b7506c56f4e1f -r 1d2c1d24c4f02b809c49f358a22971f6285c3f1a templates/webapps/tool_shed/repository/view_tool_metadata.mako --- a/templates/webapps/tool_shed/repository/view_tool_metadata.mako +++ b/templates/webapps/tool_shed/repository/view_tool_metadata.mako @@ -22,7 +22,7 @@ <%inherit file="${inherit(context)}"/> %if render_repository_actions_for == 'tool_shed': - ${render_tool_shed_repository_actions( repository=repository, changeset_revision=changeset_revision )} + ${render_tool_shed_repository_actions( repository=repository, metadata=metadata, changeset_revision=changeset_revision )} %else: ${render_galaxy_repository_actions( repository=repository )} %endif https://bitbucket.org/galaxy/galaxy-central/commits/5b67e047172f/ Changeset: 5b67e047172f User: davebgx Date: 2014-06-11 21:08:05 Summary: Merge stable. Affected #: 1 file 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