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

Fix for SelectToolParameters that utilize dynamic options and that make use of __trans__ failing at get_legal_values().

Browse Source
This commit is contained in:
Daniel Blankenberg
2015-02-06 11:56:54 -05:00
parent f4ec978d9e
commit 1155ead7ff
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parameters/basic.py
+11 -5
View File
@@ -782,13 +782,17 @@ class SelectToolParameter( ToolParameter ):
self.legal_values.add( value )
self.is_dynamic = ( ( self.dynamic_options is not None ) or ( self.options is not None ) )
def _get_dynamic_options_call_other_values( self, trans, other_values ):
call_other_values = { "__trans__": trans }
if other_values:
call_other_values.update( other_values.dict )
return call_other_values
def get_options( self, trans, other_values ):
if self.options:
return self.options.get_options( trans, other_values )
elif self.dynamic_options:
call_other_values = {"__trans__": trans}
if other_values:
call_other_values.update( other_values.dict )
call_other_values = self._get_dynamic_options_call_other_values( trans, other_values )
try:
return eval( self.dynamic_options, self.tool.code_namespace, call_other_values )
except Exception:
@@ -805,8 +809,10 @@ class SelectToolParameter( ToolParameter ):
return map( _get_UnvalidatedValue_value, set( v for _, v, _ in self.options.get_options( trans, other_values ) ) )
elif self.dynamic_options:
try:
return set( v for _, v, _ in eval( self.dynamic_options, self.tool.code_namespace, other_values ) )
except Exception:
call_other_values = self._get_dynamic_options_call_other_values( trans, other_values )
return set( v for _, v, _ in eval( self.dynamic_options, self.tool.code_namespace, call_other_values ) )
except Exception, e:
log.debug( 'Determining legal values failed for "%s": %s', self.name, e )
return set()
else:
return self.legal_values