opensource/galaxy
3
0
Fork 0
mirror of https://github.com/galaxyproject/galaxy.git synced 2026-09-24 16:30:27 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fixed another bad bug I introduced in parameters.py.

Browse Source
This commit is contained in:
Greg Von Kuster
2007-07-17 13:57:06 +00:00
parent d49891095a
commit 21247fb5e9
1 changed files with 22 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters.py
+22 -20
View File
@@ -567,26 +567,28 @@ class DataToolParameter( ToolParameter ):
# acceptrable build, id, or extension
option_build, option_id, option_extension = \
eval( self.dynamic_options, self.tool.code_namespace, other_values )
def dataset_collector( datasets, parent_hid ):
for i, data in enumerate( datasets ):
if parent_hid is not None:
hid = "%s.%d" % ( parent_hid, i + 1 )
else:
hid = str( data.hid )
if self.dynamic_options:
if ( isinstance( data.datatype, self.formats )
and (data.dbkey == option_build) and (data.id != option_id)
and (data.extension in option_extension)
and not data.deleted ):
selected = ( value and ( data in value ) )
field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected )
else:
if isinstance( data.datatype, self.formats) and not data.deleted:
selected = ( value and ( data in value ) )
field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected )
# Also collect children via association object
dataset_collector( [ assoc.child for assoc in data.children ], hid )
"""
CRUCIAL: the dataset_collector function needs to be local to DataToolParameter.get_html_field()
"""
def dataset_collector( datasets, parent_hid ):
for i, data in enumerate( datasets ):
if parent_hid is not None:
hid = "%s.%d" % ( parent_hid, i + 1 )
else:
hid = str( data.hid )
if self.dynamic_options:
if ( isinstance( data.datatype, self.formats )
and (data.dbkey == option_build) and (data.id != option_id)
and (data.extension in option_extension)
and not data.deleted ):
selected = ( value and ( data in value ) )
field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected )
else:
if isinstance( data.datatype, self.formats) and not data.deleted:
selected = ( value and ( data in value ) )
field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected )
# Also collect children via association object
dataset_collector( [ assoc.child for assoc in data.children ], hid )
dataset_collector( history.datasets, None )
some_data = bool( field.options )