From ea4db057f53d686e66ddff82cf8a8c94e5001520 Mon Sep 17 00:00:00 2001 From: Greg Von Kuster Date: Wed, 7 Mar 2012 13:35:34 -0500 Subject: [PATCH] Fix for populating the tool panel and generating the integrated_tool_panel.xml file. --- lib/galaxy/tools/__init__.py | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/lib/galaxy/tools/__init__.py b/lib/galaxy/tools/__init__.py index a0939172c63..8f38ffa82af 100755 --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -72,6 +72,13 @@ class ToolBox( object ): self.init_tools( config_filename ) except: log.exception( "Error loading tools defined in config %s", config_filename ) + if self.integrated_tool_panel_config_has_contents: + # Load self.tool_panel based on the order in self.integrated_tool_panel. + self.load_tool_panel() + # Always write the current in-memory integrated_tool_panel to the integrated_tool_panel.xml file. + # This will cover cases where the Galaxy administrator manually edited one or more of the tool panel + # config files, adding or removing locally developed tools or workflows. + self.write_integrated_tool_panel_config_file() def init_tools( self, config_filename ): """ Read the configuration file and load each tool. The following tags are currently supported: @@ -121,13 +128,6 @@ class ToolBox( object ): tool_path=tool_path, config_elems=config_elems ) self.shed_tool_confs.append( shed_tool_conf_dict ) - if self.integrated_tool_panel_config_has_contents: - # Load self.tool_panel based on the order in self.integrated_tool_panel. - self.load_tool_panel() - # Always write the current in-memory integrated_tool_panel to the integrated_tool_panel.xml file. - # This will cover cases where the Galaxy administrator manually edited one or more of the tool panel - # config files, adding or removing locally developed tools or workflows. - self.write_integrated_tool_panel_config_file() def load_tool_panel( self ): for key, val in self.integrated_tool_panel.items(): if key.startswith( 'tool_' ):