Merge stable.

This commit is contained in:
Dave Bouvier
2014-06-11 14:53:06 -04:00
8 changed files with 8 additions and 8 deletions
@@ -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
@@ -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 )}
@@ -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 )}
@@ -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 )}
@@ -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 )}
@@ -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 )}
@@ -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
@@ -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