2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/d3427fa33560/ Changeset: d3427fa33560 User: nsoranzo Date: 2014-03-14 15:21:25 Summary: Fix for https://trello.com/c/8NpgYM3U/1430-tool-panel-label-bug-introduced-with-2014... Bug was introduced in commit 5f6c670dca9f42d52480f66afeb91b63710e7ffb . Affected #: 1 file diff -r 3fb927653301a0c06a0bf94f2b6bd71b3595ec0d -r d3427fa335602629611c7aedbc52196b3a0eea64 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -285,7 +285,7 @@ section = ToolSection( elem ) log.debug( "Loading section: %s" % elem.get( 'name' ) ) for section_key, section_val in val.elems.items(): - if section_key.startswith( 'tool_' ): + if isinstance( section_val, Tool ): tool_id = section_key.replace( 'tool_', '', 1 ) if tool_id in self.tools_by_id: self.__add_tool_to_tool_panel( tool_id, section, section=True ) @@ -295,7 +295,7 @@ workflow = self.workflows_by_id[ workflow_id ] section.elems[ section_key ] = workflow log.debug( "Loaded workflow: %s %s" % ( workflow_id, workflow.name ) ) - elif isinstance( val, ToolSectionLabel ): + elif isinstance( section_val, ToolSectionLabel ): if section_val: section.elems[ section_key ] = section_val log.debug( "Loaded label: %s" % ( section_val.text ) ) https://bitbucket.org/galaxy/galaxy-central/commits/b58efefe1060/ Changeset: b58efefe1060 User: jmchilton Date: 2014-03-17 02:10:01 Summary: Merged in nsoranzo/galaxy-central (pull request #346) Fix for https://trello.com/c/8NpgYM3U/1430-tool-panel-label-bug-introduced-with-2014... Affected #: 1 file diff -r 35e90d31c3c78e4710a0f73a0126ddbd9ca8397a -r b58efefe106088d30e234373363e3cb0d6434954 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -285,7 +285,7 @@ section = ToolSection( elem ) log.debug( "Loading section: %s" % elem.get( 'name' ) ) for section_key, section_val in val.elems.items(): - if section_key.startswith( 'tool_' ): + if isinstance( section_val, Tool ): tool_id = section_key.replace( 'tool_', '', 1 ) if tool_id in self.tools_by_id: self.__add_tool_to_tool_panel( tool_id, section, section=True ) @@ -295,7 +295,7 @@ workflow = self.workflows_by_id[ workflow_id ] section.elems[ section_key ] = workflow log.debug( "Loaded workflow: %s %s" % ( workflow_id, workflow.name ) ) - elif isinstance( val, ToolSectionLabel ): + elif isinstance( section_val, ToolSectionLabel ): if section_val: section.elems[ section_key ] = section_val log.debug( "Loaded label: %s" % ( section_val.text ) ) 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.