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

DataToolParameter should no longer list empty datasets as inputs.

Browse Source
This commit is contained in:
Greg Von Kuster
2007-12-18 14:41:04 +00:00
parent e59df6cff4
commit 64bf669fe6
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/jobs/__init__.py
+1
View File
@@ -330,6 +330,7 @@ class JobWrapper( object ):
dataset.set_meta()
dataset.set_peek()
else:
dataset.state= model.Dataset.states.EMPTY
dataset.blurb = "empty"
if stderr:
dataset.state = model.Dataset.states.ERROR
lib/galaxy/tools/parameters.py
+2 -2
View File
@@ -699,7 +699,7 @@ class DataToolParameter( ToolParameter ):
hid = "%s.%d" % ( parent_hid, i + 1 )
else:
hid = str( data.hid )
if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR]:
if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR, data.states.EMPTY]:
selected = ( value and ( data in value ) )
field.add_option( "%s: %s" % ( hid, data.name[:30] ), data.id, selected )
# Also collect children via association object
@@ -732,7 +732,7 @@ class DataToolParameter( ToolParameter ):
most_recent_dataset = [None]
def dataset_collector( datasets ):
for i, data in enumerate( datasets ):
if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR]:
if isinstance( data.datatype, self.formats) and not data.deleted and data.state not in [data.states.FAKE, data.states.ERROR, data.states.EMPTY]:
most_recent_dataset[0] = data
# Also collect children via association object
dataset_collector( [ assoc.child for assoc in data.children ] )