commit/galaxy-central: dan: Always load the tool version with the highest lineage into the tool panel.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/14c1b3e05fb8/ changeset: 14c1b3e05fb8 user: dan date: 2012-09-27 18:40:05 summary: Always load the tool version with the highest lineage into the tool panel. affected #: 1 file diff -r 0527905739fe10789de3d331a44dec3507bdfdb2 -r 14c1b3e05fb884ba7b6f46a0ba3adb91bcae6485 lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -159,6 +159,8 @@ else: panel_dict = panel_component already_loaded = False + loaded_version_key = None + lineage_id = None for lineage_id in tool.lineage_ids: if lineage_id in self.tools_by_id: loaded_version_key = 'tool_%s' % lineage_id @@ -176,7 +178,13 @@ if not inserted: # If the tool is not defined in integrated_tool_panel.xml, append it to the tool panel. panel_dict[ key ] = tool - log.debug( "Loaded tool id: %s, version: %s." % ( tool.id, tool.version ) ) + log.debug( "Loaded tool id: %s, version: %s into tool panel." % ( tool.id, tool.version ) ) + elif tool.lineage_ids.index( tool_id ) > tool.lineage_ids.index( lineage_id ): + key = 'tool_%s' % tool.id + index = panel_dict.keys().index( loaded_version_key ) + del panel_dict[ loaded_version_key ] + panel_dict.insert( index, key, tool ) + log.debug( "Loaded tool id: %s, version: %s into tool panel." % ( tool.id, tool.version ) ) def load_tool_panel( self ): for key, val in self.integrated_tool_panel.items(): if key.startswith( 'tool_' ): 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.
participants (1)
-
Bitbucket