1 new commit in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/6db9ce7e0415/
Changeset: 6db9ce7e0415
Branch: next-stable
User: dan
Date: 2014-07-31 17:03:27
Summary: Fix for displaying Category name when browsing toolshed repositories by categories.
Affected #: 1 file
diff -r a12359ac3a8a90f6402f4ec36eb707aa6c5e866f -r 6db9ce7e0415b85ebb833f783458ba6d6e69c242 lib/tool_shed/grids/repository_grid_filter_manager.py
--- a/lib/tool_shed/grids/repository_grid_filter_manager.py
+++ b/lib/tool_shed/grids/repository_grid_filter_manager.py
@@ -27,7 +27,7 @@
return "Certified 2 Repository Suites %s" % trailing_string
if filter == self.filters.SUITES:
return "Repository Suites %s" % trailing_string
- return "%s" % default
+ return "%s %s" % ( default, trailing_string )
def get_filter( self, trans ):
filter = trans.get_cookie( name='toolshedrepogridfilter' )
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/51e6a073c4b9/
Changeset: 51e6a073c4b9
User: dan
Date: 2014-07-31 17:03:27
Summary: Fix for displaying Category name when browsing toolshed repositories by categories.
Affected #: 1 file
diff -r 09de83748e247d5c10c9d0e28833a8200606e46c -r 51e6a073c4b93a5df784e876abd17edffd3b0bbe lib/tool_shed/grids/repository_grid_filter_manager.py
--- a/lib/tool_shed/grids/repository_grid_filter_manager.py
+++ b/lib/tool_shed/grids/repository_grid_filter_manager.py
@@ -27,7 +27,7 @@
return "Certified 2 Repository Suites %s" % trailing_string
if filter == self.filters.SUITES:
return "Repository Suites %s" % trailing_string
- return "%s" % default
+ return "%s %s" % ( default, trailing_string )
def get_filter( self, trans ):
filter = trans.get_cookie( name='toolshedrepogridfilter' )
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/09de83748e24/
Changeset: 09de83748e24
User: dan
Date: 2014-07-31 16:55:49
Summary: When viewing a repository, make list of categories clickable and include description.
Affected #: 1 file
diff -r 15cfed4fb8186252436e64ee671b80e1c31a918b -r 09de83748e247d5c10c9d0e28833a8200606e46c templates/webapps/tool_shed/repository/view_repository.mako
--- a/templates/webapps/tool_shed/repository/view_repository.mako
+++ b/templates/webapps/tool_shed/repository/view_repository.mako
@@ -171,7 +171,7 @@
<div class="toolFormBody">
%for rca in repository.categories:
<div class="form-row">
- ${rca.category.name | h}
+ <a href="${h.url_for( controller='repository', action='browse_repositories_in_category', id=trans.security.encode_id( rca.category.id ) )}">${rca.category.name | h}</a> - ${rca.category.description | h}
</div>
%endfor
<div style="clear: both"></div>
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.
2 new commits in galaxy-central:
https://bitbucket.org/galaxy/galaxy-central/commits/1621b66460e0/
Changeset: 1621b66460e0
Branch: next-stable
User: davebgx
Date: 2014-07-30 20:12:40
Summary: Fix the tool shed URL for tools that have been installed from a tool shed using a proxy prefix.
Affected #: 1 file
diff -r 60419c47c22f23bee6545f8feaf31d14bc6eefe7 -r 1621b66460e0533de4ee155bf23a5f0fabb43e40 lib/galaxy/model/tool_shed_install/__init__.py
--- a/lib/galaxy/model/tool_shed_install/__init__.py
+++ b/lib/galaxy/model/tool_shed_install/__init__.py
@@ -79,6 +79,9 @@
def get_sharable_url( self, app ):
tool_shed_url = common_util.get_tool_shed_url_from_tool_shed_registry( app, self.tool_shed )
if tool_shed_url:
+ # Append a slash to the tool shed URL, because urlparse.urljoin will eliminate
+ # the last part of a URL if it does not end with a forward slash.
+ tool_shed_url = '%s/' % tool_shed_url
return urljoin( tool_shed_url, 'view/%s/%s' % ( self.owner, self.name ) )
return tool_shed_url
https://bitbucket.org/galaxy/galaxy-central/commits/03350a21700c/
Changeset: 03350a21700c
User: davebgx
Date: 2014-07-30 20:13:07
Summary: Merge with 1621b66460e0533de4ee155bf23a5f0fabb43e40
Affected #: 1 file
diff -r 42b8dd13c021b3500e0ebfd416ee2267c28b47a2 -r 03350a21700c83d042a952d82387bb295c25fb73 lib/galaxy/model/tool_shed_install/__init__.py
--- a/lib/galaxy/model/tool_shed_install/__init__.py
+++ b/lib/galaxy/model/tool_shed_install/__init__.py
@@ -79,6 +79,9 @@
def get_sharable_url( self, app ):
tool_shed_url = common_util.get_tool_shed_url_from_tool_shed_registry( app, self.tool_shed )
if tool_shed_url:
+ # Append a slash to the tool shed URL, because urlparse.urljoin will eliminate
+ # the last part of a URL if it does not end with a forward slash.
+ tool_shed_url = '%s/' % tool_shed_url
return urljoin( tool_shed_url, 'view/%s/%s' % ( self.owner, self.name ) )
return tool_shed_url
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.