1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/changeset/e96f8c994bb6/ changeset: e96f8c994bb6 user: greg date: 2011-11-03 21:23:59 summary: Temporary work-arounds for dealing with Galaxy panels when switching from workflow UI and Galaxy UI. affected #: 2 files diff -r 0622b489a0f17f4b328473a2930f335d8d879fa1 -r e96f8c994bb629cd0b3b0cb5387a6db84c7c2857 lib/galaxy/web/controllers/admin.py --- a/lib/galaxy/web/controllers/admin.py +++ b/lib/galaxy/web/controllers/admin.py @@ -800,7 +800,7 @@ message += 'directory in order to automatically install tools from a Galaxy tool shed (e.g., the file name <b>shed_tool_conf.xml</b> whose ' message += '<b><toolbox></b> tag is <b><toolbox tool_path="../shed_tools"></b>).<p/>See the ' message += '<a href="http://wiki.g2.bx.psu.edu/Tool%20Shed#Automatic_installation_of_Galaxy_tool_..." ' - message += 'target=_blank">Automatic installation of Galaxy tool shed repository tools into a local Galaxy instance</a> section of the ' + message += 'target="_blank">Automatic installation of Galaxy tool shed repository tools into a local Galaxy instance</a> section of the ' message += '<a href="http://wiki.g2.bx.psu.edu/Tool%20Shed" target="_blank">Galaxy tool shed wiki</a> for all of the details.' return trans.show_error_message( message ) message = kwd.get( 'message', '' ) diff -r 0622b489a0f17f4b328473a2930f335d8d879fa1 -r e96f8c994bb629cd0b3b0cb5387a6db84c7c2857 lib/galaxy/web/controllers/workflow.py --- a/lib/galaxy/web/controllers/workflow.py +++ b/lib/galaxy/web/controllers/workflow.py @@ -1193,20 +1193,31 @@ # the Galaxy panels displayed whenever in Galaxy. message += "The workflow requires the following tools that are not available in this Galaxy instance." message += "You can likely install the required tools from one of the Galaxy tool sheds listed below.<br/><br/>" - for tool_shed_name, tool_shed_url in trans.app.tool_shed_registry.tool_sheds.items(): - if tool_shed_url.endswith( '/' ): - tool_shed_url = tool_shed_url.rstrip( '/' ) - url = '%s/repository/find_tools?galaxy_url=%s&webapp=galaxy' % ( tool_shed_url, trans.request.host ) + for shed_name, shed_url in trans.app.tool_shed_registry.tool_sheds.items(): + if shed_url.endswith( '/' ): + shed_url = shed_url.rstrip( '/' ) + url = '%s/repository/find_tools?galaxy_url=%s&webapp=%s' % ( shed_url, trans.request.host, webapp ) for missing_tool_tup in missing_tool_tups: missing_tool_id = missing_tool_tup[0] url += '&tool_id=%s' % missing_tool_id - message += '<a href="%s">%s</a><br/>' % ( url, tool_shed_name ) + message += '<a href="%s">%s</a><br/>' % ( url, shed_name ) status = 'error' - return trans.response.send_redirect( web.url_for( controller='admin', - action='index', - webapp='galaxy', - message=message, - status=status ) ) + if local_file or tool_shed_url: + # Another Galaxy panels Hack: The request did not originate from the Galaxy + # workflow view, so we don't need to render the Galaxy panels. + return trans.response.send_redirect( web.url_for( controller='admin', + action='center', + webapp='galaxy', + message=message, + status=status ) ) + else: + # Another Galaxy panels hack: The request originated from the Galaxy + # workflow view, so we need to render the Galaxy panels. + return trans.response.send_redirect( web.url_for( controller='admin', + action='index', + webapp='galaxy', + message=message, + status=status ) ) else: # TODO: Figure out what to do here... pass 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.