1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/ef0a2b1c879b/ changeset: ef0a2b1c879b user: dan date: 2012-01-20 22:40:34 summary: Fix for setting up column assignments for dynamic options wrt tool data tables when the index file is missing. affected #: 1 file diff -r 8a597b83448f66523531c782b027dd000e277644 -r ef0a2b1c879b51c215afd445c248eb604645b29f lib/galaxy/tools/parameters/dynamic_options.py --- a/lib/galaxy/tools/parameters/dynamic_options.py +++ b/lib/galaxy/tools/parameters/dynamic_options.py @@ -411,16 +411,15 @@ app = tool_param.tool.app if tool_data_table_name in app.tool_data_tables: self.tool_data_table = app.tool_data_tables[ tool_data_table_name ] + # Column definitions are optional, but if provided override those from the table + if elem.find( "column" ) is not None: + self.parse_column_definitions( elem ) + else: + self.columns = self.tool_data_table.columns # Set self.missing_index_file if the index file to # which the tool_data_table refers does not exist. if self.tool_data_table.missing_index_file: self.missing_index_file = self.tool_data_table.missing_index_file - else: - # Column definitions are optional, but if provided override those from the table - if elem.find( "column" ) is not None: - self.parse_column_definitions( elem ) - else: - self.columns = self.tool_data_table.columns else: self.missing_tool_data_table_name = tool_data_table_name log.warn( "Data table named '%s' is required by tool but not configured" % tool_data_table_name ) 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.