From 28487f83660ae6ef3c71cbfb4a028cf954122aef Mon Sep 17 00:00:00 2001 From: Dave Bouvier Date: Tue, 2 Apr 2013 13:34:25 -0400 Subject: [PATCH] Enable scrolling for the left panel in the tool shed. Fix for determining if a repository dependency can be added to a container. --- lib/tool_shed/util/repository_dependency_util.py | 7 +++---- templates/webapps/tool_shed/admin/index.mako | 2 +- templates/webapps/tool_shed/index.mako | 2 +- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/lib/tool_shed/util/repository_dependency_util.py b/lib/tool_shed/util/repository_dependency_util.py index 4c1b37b118b..e8fe5ef1d44 100644 --- a/lib/tool_shed/util/repository_dependency_util.py +++ b/lib/tool_shed/util/repository_dependency_util.py @@ -85,10 +85,9 @@ def can_add_to_key_rd_dicts( key_rd_dict, key_rd_dicts ): for kr_dict in key_rd_dicts: key = kr_dict.keys()[ 0 ] if key == k: - val = kr_dict[ key ] - for repository_dependency in val: - if repository_dependency[ 0:3 ] == partial_rd: - return False + repository_dependency = kr_dict[ key ] + if repository_dependency[ 0:3 ] == partial_rd: + return False return True def create_repository_dependency_objects( trans, tool_path, tool_shed_url, repo_info_dicts, reinstalling=False, install_repository_dependencies=False, diff --git a/templates/webapps/tool_shed/admin/index.mako b/templates/webapps/tool_shed/admin/index.mako index 38a45b4ce41..29cc77399b0 100644 --- a/templates/webapps/tool_shed/admin/index.mako +++ b/templates/webapps/tool_shed/admin/index.mako @@ -40,7 +40,7 @@
Administration
-
+
diff --git a/templates/webapps/tool_shed/index.mako b/templates/webapps/tool_shed/index.mako index 3791b0cc48f..f67ea4a697e 100644 --- a/templates/webapps/tool_shed/index.mako +++ b/templates/webapps/tool_shed/index.mako @@ -41,7 +41,7 @@
${trans.app.shed_counter.valid_tools | h} valid tools on ${trans.app.shed_counter.generation_time | h}
-
+
%if user_id or repository_id: