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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/c85032480141/
Changeset: c85032480141
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 37cf9cd764fa3a306e5a74ec05ddfe4046060ae7 -r c85032480141d4280903fc11382e38e9176f39b0 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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/37cf9cd764fa/
Changeset: 37cf9cd764fa
User: jmchilton
Date: 2014-12-03 21:34:00+00:00
Summary: Small tweak to DataCollectionToolParameter interface for uniformity with DataToolParameter.
Affected #: 1 file
diff -r 25d6c1903eceb8a2ed47459d1fefcfaed57e8995 -r 37cf9cd764fa3a306e5a74ec05ddfe4046060ae7 lib/galaxy/tools/parameters/basic.py
--- a/lib/galaxy/tools/parameters/basic.py
+++ b/lib/galaxy/tools/parameters/basic.py
@@ -2222,6 +2222,10 @@
raise ValueError( "History does not include a dataset collection of the correct type or containing the correct types of datasets" )
if value in [None, "None"]:
return None
+ # would really like to not need to handle lists in here but
+ # doing it for uniformity with DataToolParameters for now.
+ if isinstance( value, list ):
+ value = value[ 0 ]
if isinstance( value, str ) and value.find( "," ) > 0:
value = [ int( value_part ) for value_part in value.split( "," ) ]
elif isinstance( value, trans.app.model.HistoryDatasetCollectionAssociation ):
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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/7ba05957588a/
Changeset: 7ba05957588a
Branch: stable
User: natefoo
Date: 2014-12-03 19:00:28+00:00
Summary: Update tag latest_2014.10.06 for changeset 546ff6ef27b4
Affected #: 1 file
diff -r 546ff6ef27b4b83e26ae228c292fd981173ac550 -r 7ba05957588aff263132db3d7c0fad6a94b3a466 .hgtags
--- a/.hgtags
+++ b/.hgtags
@@ -20,4 +20,4 @@
ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11
548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11
2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06
-acb2548443ae42d39ef200d035ccc0481d6b930c latest_2014.10.06
+546ff6ef27b4b83e26ae228c292fd981173ac550 latest_2014.10.06
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.