Skip to content

Commit

Permalink
Merge pull request galaxyproject#1758 from jmchilton/ts_section_fix
Browse files Browse the repository at this point in the history
[16.01] Fix updating in-memory tools for tool shed installs into sections.
  • Loading branch information
blankenberg committed Feb 18, 2016
2 parents 3f34131 + 4c0993c commit b4c823f
Showing 1 changed file with 3 additions and 3 deletions.
6 changes: 3 additions & 3 deletions lib/galaxy/tools/toolbox/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ def load_item( self, item, tool_path, panel_dict=None, integrated_panel_dict=Non
elif item_type == 'workflow':
self._load_workflow_tag_set( item, panel_dict=panel_dict, integrated_panel_dict=integrated_panel_dict, load_panel_dict=load_panel_dict, index=index )
elif item_type == 'section':
self._load_section_tag_set( item, tool_path=tool_path, load_panel_dict=load_panel_dict, index=index )
self._load_section_tag_set( item, tool_path=tool_path, load_panel_dict=load_panel_dict, index=index, internal=internal )
elif item_type == 'label':
self._load_label_tag_set( item, panel_dict=panel_dict, integrated_panel_dict=integrated_panel_dict, load_panel_dict=load_panel_dict, index=index )
elif item_type == 'tool_dir':
Expand Down Expand Up @@ -651,7 +651,7 @@ def _load_label_tag_set( self, item, panel_dict, integrated_panel_dict, load_pan
panel_dict[ key ] = label
integrated_panel_dict.update_or_append( index, key, label )

def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None ):
def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None, internal=False ):
key = item.get( "id" )
if key in self._tool_panel:
section = self._tool_panel[ key ]
Expand All @@ -674,7 +674,7 @@ def _load_section_tag_set( self, item, tool_path, load_panel_dict, index=None ):
load_panel_dict=load_panel_dict,
guid=sub_item.get( 'guid' ),
index=sub_index,
internal=True,
internal=internal,
)

# Ensure each tool's section is stored
Expand Down

0 comments on commit b4c823f

Please sign in to comment.