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

Make workflows compatible with change made in 29680fa5c35e that makes tool help a template rather than static text. Bonus: images in tool help now display in workflow editor as well.

Browse Source
This commit is contained in:
Jeremy Goecks
2012-08-08 08:39:39 -04:00
parent 6f33240584
commit 33cfa95096
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
lib/galaxy/web/controllers/workflow.py
+2 -2
View File
@@ -655,7 +655,7 @@ class WorkflowController( BaseUIController, SharableMixin, UsesStoredWorkflowMix
'name': module.get_name(),
'tool_id': module.get_tool_id(),
'tool_state': module.get_state(),
'tooltip': module.get_tooltip(),
'tooltip': module.get_tooltip( static_path=url_for( '/static' ) ),
'data_inputs': module.get_data_inputs(),
'data_outputs': module.get_data_outputs(),
'form_html': module.get_config_form(),
@@ -732,7 +732,7 @@ class WorkflowController( BaseUIController, SharableMixin, UsesStoredWorkflowMix
'tool_id': module.get_tool_id(),
'name': module.get_name(),
'tool_state': module.get_state(),
'tooltip': module.get_tooltip(),
'tooltip': module.get_tooltip( static_path=url_for( '/static' ) ),
'tool_errors': module.get_errors(),
'data_inputs': module.get_data_inputs(),
'data_outputs': module.get_data_outputs(),
lib/galaxy/workflow/modules.py
+3 -3
View File
@@ -49,7 +49,7 @@ class WorkflowModule( object ):
return self.name
def get_tool_id( self ):
return None
def get_tooltip( self ):
def get_tooltip( self, static_path='' ):
return None
## ---- Configuration time -----------------------------------------------
@@ -258,8 +258,8 @@ class ToolModule( WorkflowModule ):
return self.state.encode( self.tool, self.trans.app, secure=secure )
def get_errors( self ):
return self.errors
def get_tooltip( self ):
return self.tool.help
def get_tooltip( self, static_path='' ):
return self.tool.help.render( static_path=static_path )
def get_data_inputs( self ):
data_inputs = []
def callback( input, value, prefixed_name, prefixed_label ):