commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/06d53d20887d/ Changeset: 06d53d20887d Branch: next-stable User: dan Date: 2014-12-03 21:52:56+00:00 Summary: Fix for DynamicOptions AdditionalValueFilter when columns have not been assigned and to give value preference over name. Affected #: 1 file diff -r 4b6b1d2d740732a982c922b264d2027ed2c90370 -r 06d53d20887d55bf27f412c2248741e940d5424f lib/galaxy/tools/parameters/dynamic_options.py --- a/lib/galaxy/tools/parameters/dynamic_options.py +++ b/lib/galaxy/tools/parameters/dynamic_options.py @@ -301,8 +301,11 @@ add_value = [] for i in range( self.dynamic_option.largest_index + 1 ): add_value.append( "" ) - add_value[self.dynamic_option.columns['value']] = self.value - add_value[self.dynamic_option.columns['name']] = self.name + value_col = self.dynamic_option.columns.get( 'value', 0 ) + name_col = self.dynamic_option.columns.get( 'name', value_col ) + # Set name first, then value, in case they are the same column + add_value[ name_col ] = self.name + add_value[ value_col ] = self.value if self.index is not None: rval.insert( self.index, add_value ) else: https://bitbucket.org/galaxy/galaxy-central/commits/caf0f2bf161d/ Changeset: caf0f2bf161d User: dan Date: 2014-12-03 21:54:10+00:00 Summary: merge Affected #: 0 files 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.
participants (1)
-
commits-noreply@bitbucket.org