1 new commit in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/bf0057b13f58/ Changeset: bf0057b13f58 User: dannon Date: 2013-10-24 21:18:51 Summary: Strip quota information and url from primary users collection -- not useful, and a ton of extra info that can be attained other ways. Issue deprecation warning with dist. Affected #: 1 file diff -r 05fb304579771af681eb1a89de633133364c5f7d -r bf0057b13f58f5c5438f1a6477b27bfceb14a2ce lib/galaxy/webapps/galaxy/api/users.py --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -4,7 +4,7 @@ import logging from paste.httpexceptions import HTTPBadRequest, HTTPNotImplemented from galaxy import util, web -from galaxy.web.base.controller import BaseAPIController, url_for +from galaxy.web.base.controller import BaseAPIController log = logging.getLogger( __name__ ) @@ -22,27 +22,19 @@ query = trans.sa_session.query( trans.app.model.User ) deleted = util.string_as_bool( deleted ) if deleted: - route = 'deleted_user' query = query.filter( trans.app.model.User.table.c.deleted == True ) # only admins can see deleted users if not trans.user_is_admin(): return [] - else: - route = 'user' query = query.filter( trans.app.model.User.table.c.deleted == False ) # special case: user can see only their own user if not trans.user_is_admin(): item = trans.user.to_dict( value_mapper={ 'id': trans.security.encode_id } ) - item['url'] = url_for( route, id=item['id'] ) - item['quota_percent'] = trans.app.quota_agent.get_percent( trans=trans ) return [item] - for user in query: item = user.to_dict( value_mapper={ 'id': trans.security.encode_id } ) #TODO: move into api_values - item['quota_percent'] = trans.app.quota_agent.get_percent( trans=trans ) - item['url'] = url_for( route, id=item['id'] ) rval.append( item ) return rval 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.