2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/014548c6843c/ Changeset: 014548c6843c User: dan Date: 2013-05-23 17:11:37 Summary: Fix for TabularToolDataTable.get_column_name_list() when value column is overloaded by e.g. name. Affected #: 1 file diff -r 23dcf647ab620a032be9cbc3805707dff75f63b5 -r 014548c6843c8aa507719e4831f982ac967c5d4c lib/galaxy/tools/data/__init__.py --- a/lib/galaxy/tools/data/__init__.py +++ b/lib/galaxy/tools/data/__init__.py @@ -297,9 +297,12 @@ found_column = False for name, index in self.columns.iteritems(): if index == i: - rval.append( name ) + if not found_column: + rval.append( name ) + elif name == 'value': + #the column named 'value' always has priority over other named columns + rval[ -1 ] = name found_column = True - break if not found_column: rval.append( None ) return rval https://bitbucket.org/galaxy/galaxy-central/commits/03ebba1d1de6/ Changeset: 03ebba1d1de6 Branch: stable User: dan Date: 2013-05-23 17:11:37 Summary: Fix for TabularToolDataTable.get_column_name_list() when value column is overloaded by e.g. name. Affected #: 1 file diff -r 0f51ae4f1c84c5bab6cd1c93ae837696be9565e1 -r 03ebba1d1de6f14ccb00e08795ef2f1896135bae lib/galaxy/tools/data/__init__.py --- a/lib/galaxy/tools/data/__init__.py +++ b/lib/galaxy/tools/data/__init__.py @@ -273,9 +273,12 @@ found_column = False for name, index in self.columns.iteritems(): if index == i: - rval.append( name ) + if not found_column: + rval.append( name ) + elif name == 'value': + #the column named 'value' always has priority over other named columns + rval[ -1 ] = name found_column = True - break if not found_column: rval.append( None ) return rval 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.