1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/9afc3e4a3561/ Changeset: 9afc3e4a3561 User: dannon Date: 2014-05-19 18:39:59 Summary: Merge PR394 from stable. Affected #: 2 files diff -r 40c02d5cfc7da40d6b844a8120a019d611462e02 -r 9afc3e4a3561166beb69d344178338fa954ad5ee lib/galaxy/web/base/controller.py --- a/lib/galaxy/web/base/controller.py +++ b/lib/galaxy/web/base/controller.py @@ -188,7 +188,7 @@ except MessageException: raise # handled in the caller except: - log.exception( "Execption in get_object check for %s %s:" % ( class_name, str( id ) ) ) + log.exception( "Exception in get_object check for %s %s:" % ( class_name, str( id ) ) ) raise Exception( 'Server error retrieving %s id ( %s ).' % ( class_name, str( id ) ) ) @@ -204,7 +204,7 @@ except MessageException, e: raise HTTPBadRequest( detail=e.err_msg ) except Exception, e: - log.exception( "Execption in get_object check for %s %s: %s" % ( class_name, str( id ), str( e ) ) ) + log.exception( "Exception in get_object check for %s %s: %s" % ( class_name, str( id ), str( e ) ) ) raise HTTPInternalServerError( comment=str( e ) ) def validate_in_users_and_groups( self, trans, payload ): @@ -2771,7 +2771,7 @@ return self.get_object( trans, id, 'Quota', check_ownership=False, check_accessible=False, deleted=deleted ) -class UsesTagsMixin( object ): +class UsesTagsMixin( SharableItemSecurityMixin ): def get_tag_handler( self, trans ): return trans.app.tag_handler diff -r 40c02d5cfc7da40d6b844a8120a019d611462e02 -r 9afc3e4a3561166beb69d344178338fa954ad5ee lib/galaxy/webapps/galaxy/api/item_tags.py --- a/lib/galaxy/webapps/galaxy/api/item_tags.py +++ b/lib/galaxy/webapps/galaxy/api/item_tags.py @@ -4,7 +4,7 @@ import logging from galaxy import web from galaxy.web.base.controller import BaseAPIController, UsesTagsMixin -from paste.httpexceptions import HTTPNotImplemented, HTTPBadRequest +from paste.httpexceptions import HTTPBadRequest log = logging.getLogger( __name__ ) 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.