diff options
| author | mo khan <mo@mokhan.ca> | 2014-05-18 21:10:52 -0600 |
|---|---|---|
| committer | mo khan <mo@mokhan.ca> | 2014-05-18 21:10:52 -0600 |
| commit | 3f4139923a574227beeae5033b90d82e910b9bed (patch) | |
| tree | 02606117b5e2893f3097c57e8345990defa50af8 | |
| parent | 1803cacae761c876fe5b554a1edde4cee0efdb21 (diff) | |
order by sign in count and display how long ago each user has signed in at.
| -rw-r--r-- | app/controllers/admin/users_controller.rb | 2 | ||||
| -rw-r--r-- | app/views/admin/users/index.html.erb | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/admin/users_controller.rb b/app/controllers/admin/users_controller.rb index 8d76a18a..6159bff5 100644 --- a/app/controllers/admin/users_controller.rb +++ b/app/controllers/admin/users_controller.rb @@ -1,7 +1,7 @@ module Admin class UsersController < AdminController def index - @users = User.includes(:avatar).order(:created_at => :desc) + @users = User.includes(:avatar).order(sign_in_count: :desc) expires_in(10.minutes) end diff --git a/app/views/admin/users/index.html.erb b/app/views/admin/users/index.html.erb index c7756f45..214b8290 100644 --- a/app/views/admin/users/index.html.erb +++ b/app/views/admin/users/index.html.erb @@ -23,9 +23,9 @@ <td><%= link_to user.name, admin_user_path(user) %></td> <td><%= mail_to user.email %></td> <td><%= user.latitude %>, <%= user.longitude %></td> - <td><%= user.last_sign_in_at %></td> - <td><%= user.current_sign_in_at %></td> - <td><%= user.created_at %></td> + <td><%= time_ago_in_words(user.last_sign_in_at) %></td> + <td><%= time_ago_in_words(user.current_sign_in_at) %></td> + <td><%= time_ago_in_words(user.created_at) %></td> </tr> <% end %> </tbody> |