diff options
| author | Azul <azul@leap.se> | 2012-11-26 19:17:08 +0100 |
|---|---|---|
| committer | Azul <azul@leap.se> | 2012-11-26 19:17:08 +0100 |
| commit | fa58393f4b665434830535b3e0c1a325c31ce03b (patch) | |
| tree | dff2714a47805f248913fb9b4773a6e267d864b0 /users/app/controllers | |
| parent | bf74255d1530fe5852dc6e6c27ef975ce9aa8d3c (diff) | |
| parent | a941c89293bcbb067c6152b63765ead38a484b81 (diff) | |
Merge branch 'feature/admin-users-list' into develop
Diffstat (limited to 'users/app/controllers')
| -rw-r--r-- | users/app/controllers/users_controller.rb | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/users/app/controllers/users_controller.rb b/users/app/controllers/users_controller.rb index 4912ac8..925b584 100644 --- a/users/app/controllers/users_controller.rb +++ b/users/app/controllers/users_controller.rb @@ -8,7 +8,13 @@ class UsersController < ApplicationController respond_to :json, :html def index - @users = User.all + if params[:query] + @users = User.by_login.startkey(params[:query]).endkey(params[:query].succ) + else + @users = User.by_created_at.descending + end + @users = @users.limit(10) + respond_with @users.map(&:login).sort end def new |