commit/galaxy-central: dan: Fix for DynamicOptions AdditionalValueFilter when columns have not been assigned and to give value preference over name.
1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9c482e1d9b3c/ Changeset: 9c482e1d9b3c Branch: 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 caade2c602d65a005d54997e95fcb1a9eab6ea17 -r 9c482e1d9b3cfdb2936b3f230d434c1f27898eff 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: 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