2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/1c92aed71881/ Changeset: 1c92aed71881 Branch: stable User: inithello Date: 2013-04-02 19:34:25 Summary: Enable scrolling for the left panel in the tool shed. Fix for determining if a repository dependency can be added to a container. Affected #: 3 files diff -r 9264cf7148c08082d0706c0cf4b74f6a9332dc4d -r 1c92aed71881e3a15648e3be9478a69f76c50498 lib/tool_shed/util/repository_dependency_util.py --- a/lib/tool_shed/util/repository_dependency_util.py +++ b/lib/tool_shed/util/repository_dependency_util.py @@ -85,10 +85,9 @@ 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 -r 9264cf7148c08082d0706c0cf4b74f6a9332dc4d -r 1c92aed71881e3a15648e3be9478a69f76c50498 templates/webapps/tool_shed/admin/index.mako --- a/templates/webapps/tool_shed/admin/index.mako +++ b/templates/webapps/tool_shed/admin/index.mako @@ -40,7 +40,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'>Administration</div></div> - <div class="page-container" style="padding: 10px;"> + <div class="unified-panel-body" style="padding: 10px; overflow: auto;"><div class="toolMenu"><div class="toolSectionList"><div class="toolSectionTitle"> diff -r 9264cf7148c08082d0706c0cf4b74f6a9332dc4d -r 1c92aed71881e3a15648e3be9478a69f76c50498 templates/webapps/tool_shed/index.mako --- a/templates/webapps/tool_shed/index.mako +++ b/templates/webapps/tool_shed/index.mako @@ -41,7 +41,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'>${trans.app.shed_counter.valid_tools | h} valid tools on ${trans.app.shed_counter.generation_time | h}</div></div> - <div class="page-container" style="padding: 10px;"> + <div class="unified-panel-body" style="padding: 10px; overflow: auto;"><div class="toolMenu"><div class="toolSectionList"> %if user_id or repository_id: https://bitbucket.org/galaxy/galaxy-central/commits/f9d8a99135ce/ Changeset: f9d8a99135ce User: inithello Date: 2013-04-02 19:34:53 Summary: Pull in changes from stable branch. Affected #: 3 files diff -r fe538afce7d41adec8c60f197c226e92702225f4 -r f9d8a99135ce4be3ae55459ecf177a382fe4c93a lib/tool_shed/util/repository_dependency_util.py --- a/lib/tool_shed/util/repository_dependency_util.py +++ b/lib/tool_shed/util/repository_dependency_util.py @@ -85,10 +85,9 @@ 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 -r fe538afce7d41adec8c60f197c226e92702225f4 -r f9d8a99135ce4be3ae55459ecf177a382fe4c93a templates/webapps/tool_shed/admin/index.mako --- a/templates/webapps/tool_shed/admin/index.mako +++ b/templates/webapps/tool_shed/admin/index.mako @@ -40,7 +40,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'>Administration</div></div> - <div class="page-container" style="padding: 10px;"> + <div class="unified-panel-body" style="padding: 10px; overflow: auto;"><div class="toolMenu"><div class="toolSectionList"><div class="toolSectionTitle"> diff -r fe538afce7d41adec8c60f197c226e92702225f4 -r f9d8a99135ce4be3ae55459ecf177a382fe4c93a templates/webapps/tool_shed/index.mako --- a/templates/webapps/tool_shed/index.mako +++ b/templates/webapps/tool_shed/index.mako @@ -41,7 +41,7 @@ <div class="unified-panel-header" unselectable="on"><div class='unified-panel-header-inner'>${trans.app.shed_counter.valid_tools | h} valid tools on ${trans.app.shed_counter.generation_time | h}</div></div> - <div class="page-container" style="padding: 10px;"> + <div class="unified-panel-body" style="padding: 10px; overflow: auto;"><div class="toolMenu"><div class="toolSectionList"> %if user_id or repository_id: 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.