1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/96a2ab47b882/ Changeset: 96a2ab47b882 User: Richard Burhans Date: 2013-09-17 20:37:36 Summary: Fix integrated_tool_panel dictionary before writing integrated_tool_panel.xml to keep tools/workflows in multiple sections Affected #: 1 file diff -r 48fad71361b3075c85c7d365dd52c106cabad73a -r 96a2ab47b882690df5a2a962d3689474e4312e3a lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -154,8 +154,24 @@ # 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. The value of integrated_tool_panel # will be False when things like functional tests are the caller. + self.fix_integrated_tool_panel_dict() self.write_integrated_tool_panel_config_file() + def fix_integrated_tool_panel_dict( self ): + # HACK: instead of fixing after the fact, I suggest some combination of: + # 1) adjusting init_tools() and called methods to get this right + # 2) redesigning the code and/or data structure used to read/write integrated_tool_panel.xml + for key, value in self.integrated_tool_panel.iteritems(): + if key.startswith( 'section_' ): + for section_key, section_value in value.elems.iteritems(): + if section_value is None: + if section_key.startswith( 'tool_' ): + tool_id = section_key[5:] + value.elems[section_key] = self.tools_by_id.get( tool_id ) + elif section_key.startswith( 'workflow_' ): + workflow_id = section_key[9:] + value.elems[section_key] = self.workflows_by_id.get( workflow_id ) + def init_tools( self, config_filename ): """ Read the configuration file and load each tool. The following tags are currently supported: 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.