1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/changeset/4d22e26e595a/ changeset: 4d22e26e595a user: jgoecks date: 2012-08-08 14:39:39 summary: 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. affected #: 2 files
diff -r 4f17b0d16ff7b878fba9c6e8730998ee61c54c5e -r 4d22e26e595a278f96b814908b8dc24b3f77a06b lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py +++ b/lib/galaxy/web/controllers/workflow.py @@ -655,7 +655,7 @@ '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 @@ '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(),
diff -r 4f17b0d16ff7b878fba9c6e8730998ee61c54c5e -r 4d22e26e595a278f96b814908b8dc24b3f77a06b lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -49,7 +49,7 @@ 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 @@ 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 ):
Repository URL: https://bitbucket.org/galaxy/galaxy-central/
--
This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.