commit/galaxy-central: greg: Fix for displaying if a repository dependency has the prior_installation_required flag set to True when inside a container, and render the orphan setting for tool dependencies as 'yes' or 'no' instead of True or false.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1f9a0bf662b3/ Changeset: 1f9a0bf662b3 User: greg Date: 2013-05-09 20:39:11 Summary: Fix for displaying if a repository dependency has the prior_installation_required flag set to True when inside a container, and render the orphan setting for tool dependencies as 'yes' or 'no' instead of True or false. Affected #: 1 file diff -r 6ba6f297b9694e29ff774a33e9b88b9f666ddee7 -r 1f9a0bf662b376455fbc39dcd679cf443c4d0cfa templates/webapps/tool_shed/repository/common.mako --- a/templates/webapps/tool_shed/repository/common.mako +++ b/templates/webapps/tool_shed/repository/common.mako @@ -544,6 +544,7 @@ <%def name="render_repository_dependency( repository_dependency, pad, parent, row_counter, row_is_header=False )"><% + from galaxy.util import string_as_bool encoded_id = trans.security.encode_id( repository_dependency.id ) if trans.webapp.name == 'galaxy': if repository_dependency.tool_shed_repository_id: @@ -557,6 +558,7 @@ repository_name = str( repository_dependency.repository_name ) repository_owner = str( repository_dependency.repository_owner ) changeset_revision = str( repository_dependency.changeset_revision ) + prior_installation_required = string_as_bool( str( repository_dependency.prior_installation_required ) ) if prior_installation_required: prior_installation_required_str = " <i>(prior install required)</i>" else: @@ -676,6 +678,7 @@ <%def name="render_tool_dependency( tool_dependency, pad, parent, row_counter, row_is_header )"><% + from galaxy.util import string_as_bool encoded_id = trans.security.encode_id( tool_dependency.id ) is_missing = tool_dependency.installation_status not in [ 'Installed' ] if row_is_header: @@ -725,7 +728,17 @@ ${tool_dependency.install_dir | h} %endif %else: - ${tool_dependency.is_orphan | h} + %if row_is_header: + ${tool_dependency.is_orphan | h} + %else: + <% + if string_as_bool( str( tool_dependency.is_orphan ) ): + is_orpan = 'yes' + else: + is_orphan = 'no' + %> + ${is_orphan | h} + %endif %endif </${cell_type}></tr> 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