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 bug introduced in 3c40f32fa2 .

Browse Source
This commit is contained in:
Nicola Soranzo
2015-06-17 16:39:11 +01:00
parent f8b364b9f5
commit 10fc519633
2 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/tools/parser/xml.py
+2 -1
View File
@@ -25,6 +25,7 @@ from galaxy.tools.deps import requirements
import galaxy.tools
from galaxy.tools.parameters import output_collect
from galaxy.tools.parameters import dynamic_options
from galaxy.tools.parameters.output import ToolOutputActionGroup
log = logging.getLogger( __name__ )
@@ -236,7 +237,7 @@ class XmlToolSource(ToolSource):
output.tool = tool
output.from_work_dir = data_elem.get("from_work_dir", None)
output.hidden = string_as_bool( data_elem.get("hidden", "") )
output.actions = galaxy.tools.parameters.output.ToolOutputActionGroup( output, data_elem.find( 'actions' ) )
output.actions = ToolOutputActionGroup( output, data_elem.find( 'actions' ) )
output.dataset_collectors = output_collect.dataset_collectors_from_elem( data_elem )
return output
lib/galaxy/tools/parser/yaml.py
+2 -1
View File
@@ -6,6 +6,7 @@ from .util import error_on_exit_code
from galaxy.tools.deps import requirements
from galaxy.tools.parameters import output_collect
from galaxy.tools.parameters.output import ToolOutputActionGroup
from galaxy.util.odict import odict
import galaxy.tools
@@ -87,7 +88,7 @@ class YamlToolSource(ToolSource):
output.tool = tool
output.from_work_dir = output_dict.get("from_work_dir", None)
output.hidden = output_dict.get("hidden", "")
output.actions = galaxy.tools.parameters.output.ToolOutputActionGroup( output, None )
output.actions = ToolOutputActionGroup( output, None )
discover_datasets_dicts = output_dict.get( "discover_datasets", [] )
if isinstance( discover_datasets_dicts, dict ):
discover_datasets_dicts = [ discover_datasets_dicts ]