From 588567c27e6f18f1e0709a8af6e7d4cd02171a44 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Mon, 18 Feb 2013 16:00:43 -0500 Subject: [PATCH] Display the Orphan column in the valid tool dependencies container in the tool shed. --- .../webapps/community/util/container_util.py | 2 +- .../webapps/community/repository/common.mako | 16 ++++++++++------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/lib/galaxy/webapps/community/util/container_util.py b/lib/galaxy/webapps/community/util/container_util.py index a5139a1863a..6c0fa04df0c 100644 --- a/lib/galaxy/webapps/community/util/container_util.py +++ b/lib/galaxy/webapps/community/util/container_util.py @@ -514,7 +514,7 @@ def build_tool_dependencies_folder( trans, folder_id, tool_dependencies, label=' installation_status=None, repository_id=None, tool_dependency_id=None, - is_orphan=None ) + is_orphan='Orphan' ) folder.tool_dependencies.append( tool_dependency ) is_orphan_description = "these dependencies may not be required by tools in this repository" for dependency_key, requirements_dict in tool_dependencies.items(): diff --git a/templates/webapps/community/repository/common.mako b/templates/webapps/community/repository/common.mako index 517db2fe98e..d4adf976de2 100644 --- a/templates/webapps/community/repository/common.mako +++ b/templates/webapps/community/repository/common.mako @@ -628,13 +628,17 @@ ${version_str | h} <${cell_type}>${tool_dependency.type | h} - %if trans.webapp.name == 'galaxy': - %if is_missing: - <${cell_type}>${tool_dependency.installation_status | h} - %elif tool_dependency.install_dir: - <${cell_type}>${tool_dependency.install_dir | h} + <${cell_type}> + %if trans.webapp.name == 'galaxy': + %if is_missing: + ${tool_dependency.installation_status | h} + %elif tool_dependency.install_dir: + ${tool_dependency.install_dir | h} + %endif + %else: + ${tool_dependency.is_orphan | h} %endif - %endif + <% my_row = row_counter.count