2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/9854b48f8902/
Changeset: 9854b48f8902
Branch: next-stable
User: dan
Date: 2014-04-10 22:48:07
Summary: Fix for route used in displaying images on tool installed from a toolshed.
Affected #: 1 file
diff -r 5b01864ad7902af1174478a9f440cad26927f178 -r 9854b48f89026970f99b004d465ffa63aad54aad lib/galaxy/webapps/galaxy/buildapp.py
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -284,7 +284,7 @@
# ====================
# Handle displaying tool help images and README file images contained in repositories installed from the tool shed.
- webapp.add_route( '/admin_toolshed/static/images/:repository_id/:image_file',
+ webapp.add_route( '/admin_toolshed/static/images/:repository_id/{image_file:.+?}',
controller='admin_toolshed',
action='display_image_in_repository',
repository_id=None,
https://bitbucket.org/galaxy/galaxy-central/commits/452af6869205/
Changeset: 452af6869205
User: dan
Date: 2014-04-10 22:48:31
Summary: merge next-stable
Affected #: 1 file
diff -r d46493c6d83c13db73209373d2fcaf46e843f4b3 -r 452af6869205b773d42f6e49197fbbe413947eca lib/galaxy/webapps/galaxy/buildapp.py
--- a/lib/galaxy/webapps/galaxy/buildapp.py
+++ b/lib/galaxy/webapps/galaxy/buildapp.py
@@ -284,7 +284,7 @@
# ====================
# Handle displaying tool help images and README file images contained in repositories installed from the tool shed.
- webapp.add_route( '/admin_toolshed/static/images/:repository_id/:image_file',
+ webapp.add_route( '/admin_toolshed/static/images/:repository_id/{image_file:.+?}',
controller='admin_toolshed',
action='display_image_in_repository',
repository_id=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.
1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/acec53247232/
Changeset: acec53247232
User: dan
Date: 2014-04-10 21:55:26
Summary: Add a link to a tool's toolshed repository if it was installed from a ToolShed.
Affected #: 1 file
diff -r c6d9b2f1b26b219b03a74c321202dc68160e9a15 -r acec53247232cffb773b2e4a8de67fd3bdc3424e templates/webapps/galaxy/tool_form.mako
--- a/templates/webapps/galaxy/tool_form.mako
+++ b/templates/webapps/galaxy/tool_form.mako
@@ -378,3 +378,10 @@
</div></div>
%endif
+%if tool.tool_shed_repository:
+ <% tool_url = tool.tool_shed_repository.get_sharable_url( tool.app ) %>
+ %if tool_url:
+ <br/>
+ ${ render_msg( 'This tool was installed from a ToolShed, you may be able to find additional information by following this link: <a href="%s" target="_blank">%s</a>' % ( tool_url, tool_url ), 'info' ) }
+ %endif
+%endif
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.