Merge pull request #2088 from martenson/make-beta-install-config

make new beta TS tools installation via API configurable

config/galaxy.ini.sample

@@ -273,14 +273,14 @@ paste.app_factory = galaxy.web.buildapp:app_factory
 # environment plugins.  By default none will be loaded.  Set to
 # config/plugins/interactive_environments to load Galaxy's stock plugins
 # (currently just IPython).  These will require Docker to be configured and
-# have security considerations, so proceed with caution. The path is relative to the 
+# have security considerations, so proceed with caution. The path is relative to the
 # Galaxy root dir.  To use an absolute path begin the path with '/'.  This is a comma
 # separated list.
 #interactive_environment_plugins_directory =
 
 # Interactive tour directory: where to store interactive tour definition files.
 # Galaxy ships with several basic interface tours enabled, though a different
-# directory with custom tours can be specified here. The path is relative to the 
+# directory with custom tours can be specified here. The path is relative to the
 # Galaxy root dir.  To use an absolute path begin the path with '/'.  This is a comma
 # separated list.
 #tour_config_dir = config/plugins/tours
@@ -938,6 +938,10 @@ use_interactive = True
 # in 16.01 and the option will go away in the future.
 #enable_beta_tool_command_isolation = True
 
+# Enable the new interface for installing tools from Tool Shed
+# via the API. Admin menu will list both if enabled.
+#enable_beta_ts_api_install = False
+
 
 # Set the following to a number of threads greater than 1 to spawn
 # a Python task queue for dealing with large tool submissions (either

lib/galaxy/config.py

@@ -226,6 +226,9 @@ class Configuration( object ):
         self.commands_in_new_shell = string_as_bool( kwargs.get( 'enable_beta_tool_command_isolation', "True" ) )
         self.tool_submission_burst_threads = int( kwargs.get( 'tool_submission_burst_threads', '1' ) )
         self.tool_submission_burst_at = int( kwargs.get( 'tool_submission_burst_at', '10' ) )
+        # Enable new interface for API installations from TS.
+        # Admin menu will list both if enabled.
+        self.enable_beta_ts_api_install = string_as_bool( kwargs.get( 'enable_beta_ts_api_install', 'False' ) )
         # The transfer manager and deferred job queue
         self.enable_beta_job_managers = string_as_bool( kwargs.get( 'enable_beta_job_managers', 'False' ) )
         # These workflow modules should not be considered part of Galaxy's

templates/webapps/galaxy/admin/index.mako

@@ -5,7 +5,7 @@
 <%def name="title()">Galaxy Administration</%def>
 
 <%def name="stylesheets()">
-    ${parent.stylesheets()}    
+    ${parent.stylesheets()}
     ## Include "base.css" for styling tool menu and forms (details)
     ${h.css( "base", "autocomplete_tagging", "tool_menu" )}
 
@@ -58,10 +58,12 @@
                 <div class="toolSectionPad"></div>
                 <div class="toolSectionTitle">Tools and Tool Shed</div>
                 <div class="toolSectionBody">
-                    <div class="toolSectionBg">                        
+                    <div class="toolSectionBg">
                     %if trans.app.tool_shed_registry and trans.app.tool_shed_registry.tool_sheds:
                         <div class="toolTitle"><a href="${h.url_for( controller='admin_toolshed', action='browse_tool_sheds' )}" target="galaxy_main">Search Tool Shed</a></div>
-                        <div class="toolTitle"><a href="${h.url_for( controller='admin_toolshed', action='browse_toolsheds' )}" target="galaxy_main">Search Tool Shed (Beta)</a></div>
+                        %if trans.app.config.enable_beta_ts_api_install:
+                            <div class="toolTitle"><a href="${h.url_for( controller='admin_toolshed', action='browse_toolsheds' )}" target="galaxy_main">Search Tool Shed (Beta)</a></div>
+                        %endif
                     %endif
                     %if installing_repository_ids:
                         <div class="toolTitle"><a href="${h.url_for( controller='admin_toolshed', action='monitor_repository_installation', tool_shed_repository_ids=installing_repository_ids )}" target="galaxy_main">Monitor installing repositories</a></div>
@@ -120,7 +122,7 @@
                     </div>
                 </div>
             </div>
-        </div>    
+        </div>
     </div>
 </%def>