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

Add error messages for a DataToolParameter when the provided value is no longer valid due to be deleted or being in an error state.

Browse Source
This commit is contained in:
Daniel Blankenberg
2012-11-06 15:46:58 -05:00
parent e5e216f4ca
commit 96d102b647
1 changed files with 19 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+19 -6
View File
@@ -1539,25 +1539,38 @@ class DataToolParameter( ToolParameter ):
if trans.workflow_building_mode:
return None
if not value:
raise ValueError( "History does not include a dataset of the required format / build" )
raise ValueError( "History does not include a dataset of the required format / build" )
if value in [None, "None"]:
return None
if isinstance( value, list ):
return [ trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( v ) for v in value ]
rval = [ trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( v ) for v in value ]
elif isinstance( value, trans.app.model.HistoryDatasetAssociation ):
return value
rval = value
else:
return trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( value )
rval = trans.sa_session.query( trans.app.model.HistoryDatasetAssociation ).get( value )
if isinstance( rval, list ):
values = rval
else:
values = [ rval ]
for v in values:
if v:
if v.deleted:
raise ValueError( "The previously selected dataset has been previously deleted" )
if v.dataset.state in [galaxy.model.Dataset.states.ERROR, galaxy.model.Dataset.states.DISCARDED ]:
raise ValueError( "The previously selected dataset has entered an unusable state" )
return rval
def to_string( self, value, app ):
if value is None or isinstance( value, str ):
if value is None or isinstance( value, basestring ):
return value
elif isinstance( value, int ):
return str( value )
elif isinstance( value, DummyDataset ):
return None
elif isinstance( value, list) and len(value) > 0 and isinstance( value[0], DummyDataset):
return None
elif isinstance( value, list ):
return ",".join( [ val if isinstance( val, str ) else str(val.id) for val in value] )
return ",".join( [ val if isinstance( val, basestring ) else str(val.id) for val in value] )
return value.id
def to_python( self, value, app ):