commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/329f9ac7c327/ Changeset: 329f9ac7c327 Branch: admin_toolshed_static User: BjoernGruening Date: 2014-01-21 15:42:35 Summary: In case of proxy-prefix configuration the $PATH_TO_IMAGES is not correctly converted. Removing the beginning Slash solves it for proxy-prefix configurations and other are not affected. Affected #: 1 file diff -r f04a1c3c060ed6bd4febfdd9e86ed3cc74cb810e -r 329f9ac7c327341ed6552d981a686499349e5067 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -1712,7 +1712,7 @@ """ if text: if app.name == 'galaxy': - route_to_images = '/admin_toolshed/static/images/%s' % encoded_repository_id + route_to_images = 'admin_toolshed/static/images/%s' % encoded_repository_id else: # We're in the tool shed. route_to_images = '/repository/static/images/%s' % encoded_repository_id https://bitbucket.org/galaxy/galaxy-central/commits/3133b1ad1afc/ Changeset: 3133b1ad1afc User: greg Date: 2014-01-21 15:59:14 Summary: Merged in BjoernGruening/galaxy-central-bgruening/admin_toolshed_static (pull request #302) In case of proxy-prefix configuration the $PATH_TO_IMAGES is not correctly converted. Removing the beginning Slash solves it for proxy-prefix configurations and other are not affected. Affected #: 1 file diff -r f04a1c3c060ed6bd4febfdd9e86ed3cc74cb810e -r 3133b1ad1afc97875f0764f87a60552a2ac6df72 lib/tool_shed/util/shed_util_common.py --- a/lib/tool_shed/util/shed_util_common.py +++ b/lib/tool_shed/util/shed_util_common.py @@ -1712,7 +1712,7 @@ """ if text: if app.name == 'galaxy': - route_to_images = '/admin_toolshed/static/images/%s' % encoded_repository_id + route_to_images = 'admin_toolshed/static/images/%s' % encoded_repository_id else: # We're in the tool shed. route_to_images = '/repository/static/images/%s' % encoded_repository_id 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.
participants (1)
-
commits-noreply@bitbucket.org