commit/galaxy-central: greg: Keep track ot the changeset revision when viewing tool shed repositories retrieved from tool searches.
1 new changeset in galaxy-central: http://bitbucket.org/galaxy/galaxy-central/changeset/7117e30b95b5/ changeset: 7117e30b95b5 user: greg date: 2011-10-13 21:21:18 summary: Keep track ot the changeset revision when viewing tool shed repositories retrieved from tool searches. affected #: 1 file (-1 bytes) --- a/lib/galaxy/webapps/community/controllers/repository.py Thu Oct 13 14:47:13 2011 -0400 +++ b/lib/galaxy/webapps/community/controllers/repository.py Thu Oct 13 15:21:18 2011 -0400 @@ -244,7 +244,7 @@ NameColumn( "Name", key="name", link=( lambda item: dict( operation="view_or_manage_repository", - id=item.repository.id, + id=item.id, webapp="community" ) ), attach_popup=True ), DescriptionColumn( "Synopsis", @@ -373,11 +373,23 @@ @web.expose def find_tools( self, trans, **kwd ): if 'operation' in kwd: - operation = kwd['operation'].lower() + operation = kwd[ 'operation' ].lower() if operation == "view_or_manage_repository": - return trans.response.send_redirect( web.url_for( controller='repository', - action='browse_repositories', - **kwd ) ) + repository_metadata = get_repository_metadata_by_id( trans, kwd[ 'id' ] ) + repository_id = trans.security.encode_id( repository_metadata.repository.id ) + repository = get_repository( trans, repository_id ) + is_admin = trans.user_is_admin() + # The received id is a RepositoryMetadata.id, so we have to get the repository id. + kwd[ 'id' ] = repository_id + kwd[ 'changeset_revision' ] = repository_metadata.changeset_revision + if is_admin or repository.user == trans.user: + return trans.response.send_redirect( web.url_for( controller='repository', + action='manage_repository', + **kwd ) ) + else: + return trans.response.send_redirect( web.url_for( controller='repository', + action='view_repository', + **kwd ) ) params = util.Params( kwd ) message = util.restore_text( params.get( 'message', '' ) ) status = params.get( 'status', 'done' ) 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)
-
Bitbucket