1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/738b703f725c/ changeset: 738b703f725c user: greg date: 2012-08-28 20:32:04 summary: Fix handling of ToolSectionLabel objects in the tool panel. affected #: 1 file
diff -r 483cbfc5341a0331cc86185f8821cdecec52a0b4 -r 738b703f725c1ade02018489e1c8e197236e30cd lib/galaxy/tools/__init__.py --- a/lib/galaxy/tools/__init__.py +++ b/lib/galaxy/tools/__init__.py @@ -187,7 +187,9 @@ section.elems[ section_key ] = workflow log.debug( "Loaded workflow: %s %s" % ( workflow_id, workflow.name ) ) elif section_key.startswith( 'label_' ): - section.elems[ section_key ] = section_val + if section_val: + section.elems[ section_key ] = section_val + log.debug( "Loaded label: %s" % ( section_val.text ) ) self.tool_panel[ key ] = section def load_integrated_tool_panel_keys( self ): """ @@ -215,12 +217,12 @@ section.elems[ key ] = None elif section_elem.tag == 'label': key = 'label_%s' % section_elem.get( 'id' ) - section.elems[ key ] = ToolSectionLabel( section_elem ) + section.elems[ key ] = None key = 'section_%s' % elem.get( 'id' ) self.integrated_tool_panel[ key ] = section elif elem.tag == 'label': key = 'label_%s' % elem.get( 'id' ) - self.integrated_tool_panel[ key ] = ToolSectionLabel( elem ) + self.integrated_tool_panel[ key ] = None def write_integrated_tool_panel_config_file( self ): """ Write the current in-memory version of the integrated_tool_panel.xml file to disk. Since Galaxy administrators @@ -254,10 +256,11 @@ if section_item: os.write( fd, ' <workflow id="%s" />\n' % section_item.id ) elif section_key.startswith( 'label_' ): - label_id = section_item.id or '' - label_text = section_item.text or '' - label_version = section_item.version or '' - os.write( fd, ' <label id="%s" text="%s" version="%s" />\n' % ( label_id, label_text, label_version ) ) + if section_item: + label_id = section_item.id or '' + label_text = section_item.text or '' + label_version = section_item.version or '' + os.write( fd, ' <label id="%s" text="%s" version="%s" />\n' % ( label_id, label_text, label_version ) ) os.write( fd, ' </section>\n' ) os.write( fd, '</toolbox>\n' ) os.close( fd )
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.