From e8922295bd5753e0be262f141b25a05622972ee6 Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Wed, 8 Mar 2017 10:40:26 +0100 Subject: [PATCH] Remove checks for `includes_tools_for_display_in_tool_panel` and `includes_tools_for_display_in_tool_panel` when determining if initiate_repository_installation.mako should be posted to. It is sufficient to check that select_tool_panel_section_button has been clicked. --- lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py index 03039c2620b..7b103af9f53 100644 --- a/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py +++ b/lib/galaxy/webapps/galaxy/controllers/admin_toolshed.py @@ -1049,8 +1049,7 @@ class AdminToolshed( AdminGalaxy ): repo_info_dicts = [ encoding_util.tool_shed_decode( encoded_repo_info_dict ) for encoded_repo_info_dict in encoded_repo_info_dicts ] dd = dependency_display.DependencyDisplayer( trans.app ) install_repository_manager = install_manager.InstallRepositoryManager( trans.app ) - if ( ( not includes_tools_for_display_in_tool_panel and kwd.get( 'select_shed_tool_panel_config_button', False ) ) or - ( includes_tools_for_display_in_tool_panel and kwd.get( 'select_tool_panel_section_button', False ) ) ): + if kwd.get( 'select_tool_panel_section_button', False ): if updating: repository = repository_util.get_tool_shed_repository_by_id( trans.app, updating_repository_id ) decoded_updated_metadata = encoding_util.tool_shed_decode( encoded_updated_metadata ) @@ -1129,7 +1128,7 @@ class AdminToolshed( AdminGalaxy ): if not has_repository_dependencies: has_repository_dependencies = dependencies_for_repository_dict.get( 'has_repository_dependencies', False ) if not includes_tool_dependencies: - includes_tool_dependencies = dependencies_for_repository_dict.get( 'includes_tool_dependencies', False ) or requirements_status + includes_tool_dependencies = dependencies_for_repository_dict.get( 'includes_tool_dependencies', False ) if not includes_tools: includes_tools = dependencies_for_repository_dict.get( 'includes_tools', False ) if not includes_tools_for_display_in_tool_panel: