From 2a91e276b4b4f0885741fd8ffbcd4f090da9f89d Mon Sep 17 00:00:00 2001 From: Dannon Baker Date: Wed, 20 Nov 2013 16:59:01 -0800 Subject: [PATCH] Swap impersonate to select2 deferred load w/ filter. This adds a 'f_email' filter parameter to the Users api collection -- we should revisit this before the next stable release to decide how we want API filtering to actually work down the road. --- lib/galaxy/webapps/galaxy/api/users.py | 4 ++- templates/admin/impersonate.mako | 38 ++++++++++++++++++++++---- 2 files changed, 36 insertions(+), 6 deletions(-) diff --git a/lib/galaxy/webapps/galaxy/api/users.py b/lib/galaxy/webapps/galaxy/api/users.py index fddb9e747fc..274e4cdd066 100644 --- a/lib/galaxy/webapps/galaxy/api/users.py +++ b/lib/galaxy/webapps/galaxy/api/users.py @@ -14,7 +14,7 @@ log = logging.getLogger( __name__ ) class UserAPIController( BaseAPIController, UsesTagsMixin, CreatesUsersMixin, CreatesApiKeysMixin ): @web.expose_api - def index( self, trans, deleted='False', **kwd ): + def index( self, trans, deleted='False', f_email=None, **kwd ): """ GET /api/users GET /api/users/deleted @@ -23,6 +23,8 @@ class UserAPIController( BaseAPIController, UsesTagsMixin, CreatesUsersMixin, Cr rval = [] query = trans.sa_session.query( trans.app.model.User ) deleted = util.string_as_bool( deleted ) + if f_email: + query = query.filter(trans.app.model.User.email.like("%%%s%%" % f_email)) if deleted: query = query.filter( trans.app.model.User.table.c.deleted == True ) # only admins can see deleted users diff --git a/templates/admin/impersonate.mako b/templates/admin/impersonate.mako index a53e2034ab7..72f1b973ff2 100644 --- a/templates/admin/impersonate.mako +++ b/templates/admin/impersonate.mako @@ -14,11 +14,8 @@ - + +
@@ -26,4 +23,35 @@
+ %endif