From 8a15acb8a8d2cffa3c0435f5c20bcdaf2fa09ec8 Mon Sep 17 00:00:00 2001 From: Daniel Blankenberg Date: Thu, 23 May 2013 11:11:37 -0400 Subject: [PATCH] Fix for TabularToolDataTable.get_column_name_list() when value column is overloaded by e.g. name. --- lib/galaxy/tools/data/__init__.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/galaxy/tools/data/__init__.py b/lib/galaxy/tools/data/__init__.py index 92103823898..7f5938a51ec 100644 --- a/lib/galaxy/tools/data/__init__.py +++ b/lib/galaxy/tools/data/__init__.py @@ -273,9 +273,12 @@ class TabularToolDataTable( ToolDataTable ): 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