diff --git a/rhodecode/controllers/admin/users.py b/rhodecode/controllers/admin/users.py --- a/rhodecode/controllers/admin/users.py +++ b/rhodecode/controllers/admin/users.py @@ -26,6 +26,7 @@ import logging import traceback import formencode +from pylons import response from formencode import htmlfill from pylons import request, session, tmpl_context as c, url, config @@ -35,7 +36,7 @@ from pylons.i18n.translation import _ from rhodecode.lib.exceptions import DefaultUserException, \ UserOwnsReposException from rhodecode.lib import helpers as h -from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator,\ +from rhodecode.lib.auth import LoginRequired, HasPermissionAllDecorator, \ AuthUser from rhodecode.lib.base import BaseController, render @@ -44,6 +45,7 @@ from rhodecode.model.forms import UserFo from rhodecode.model.user import UserModel from rhodecode.model.meta import Session from rhodecode.lib.utils import action_logger +from rhodecode.lib.compat import json log = logging.getLogger(__name__) @@ -66,7 +68,48 @@ class UsersController(BaseController): """GET /users: All items in the collection""" # url('users') - c.users_list = self.sa.query(User).all() + c.users_list = User.query().order_by(User.username).all() + + users_data = [] + total_records = len(c.users_list) + grav_tmpl = """