3 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/ef5d3a6775d2/ Changeset: ef5d3a6775d2 Branch: fix-tooltip User: kell...@gmail.com Date: 2014-10-31 04:14:05+00:00 Summary: Adding fake host_url to tooltip rendering to stop certain tools from crashing the tool tip renderer Affected #: 1 file diff -r 06970f2cfee91d60b981308483d56a9ebb3afb55 -r ef5d3a6775d2b8616e814bbfe326f89e0192b910 lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -337,7 +337,7 @@ type_hints[ "list" ] = "List of Datasets" type_hints[ "paired" ] = "Dataset Pair" type_hints[ "list:paired" ] = "List of Dataset Pairs" - + type_input = formbuilder.DatalistInput( name="collection_type", label="Collection Type", @@ -486,7 +486,7 @@ def get_tooltip( self, static_path='' ): if self.tool.help: - return self.tool.help.render( static_path=static_path ) + return self.tool.help.render( host_url='', static_path=static_path ) else: return None https://bitbucket.org/galaxy/galaxy-central/commits/94446d6469b1/ Changeset: 94446d6469b1 Branch: fix-tooltip User: kellrott Date: 2014-11-07 22:18:32+00:00 Summary: Putting in URL to current host for tooltip host_url variable Affected #: 1 file diff -r ef5d3a6775d2b8616e814bbfe326f89e0192b910 -r 94446d6469b10a8c08479fa33ccac2b2a950484d lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -13,6 +13,7 @@ import galaxy.tools from galaxy import exceptions from galaxy import model +from galaxy import web from galaxy.dataset_collections import matching from galaxy.web.framework import formbuilder from galaxy.jobs.actions.post import ActionBox @@ -486,7 +487,7 @@ def get_tooltip( self, static_path='' ): if self.tool.help: - return self.tool.help.render( host_url='', static_path=static_path ) + return self.tool.help.render( host_url=web.url_for('/'), static_path=static_path ) else: return None https://bitbucket.org/galaxy/galaxy-central/commits/5f9b606ca882/ Changeset: 5f9b606ca882 User: dannon Date: 2014-11-08 00:53:38+00:00 Summary: Merged in kellrott/galaxy-farm/fix-tooltip (pull request #544) Adding fake host_url to tooltip rendering Affected #: 1 file diff -r 93723d1cf699eab771ccde086d34bec1fd1c22e6 -r 5f9b606ca882e8db038bd5ed67f124d8537cbe01 lib/galaxy/workflow/modules.py --- a/lib/galaxy/workflow/modules.py +++ b/lib/galaxy/workflow/modules.py @@ -13,6 +13,7 @@ import galaxy.tools from galaxy import exceptions from galaxy import model +from galaxy import web from galaxy.dataset_collections import matching from galaxy.web.framework import formbuilder from galaxy.jobs.actions.post import ActionBox @@ -337,7 +338,7 @@ type_hints[ "list" ] = "List of Datasets" type_hints[ "paired" ] = "Dataset Pair" type_hints[ "list:paired" ] = "List of Dataset Pairs" - + type_input = formbuilder.DatalistInput( name="collection_type", label="Collection Type", @@ -486,7 +487,7 @@ def get_tooltip( self, static_path='' ): if self.tool.help: - return self.tool.help.render( static_path=static_path ) + return self.tool.help.render( host_url=web.url_for('/'), static_path=static_path ) else: return None 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.