Commit 1803caca
Changed files (4)
app
controllers
admin
views
admin
users
config
app/controllers/admin/users_controller.rb
@@ -2,10 +2,11 @@ module Admin
class UsersController < AdminController
def index
@users = User.includes(:avatar).order(:created_at => :desc)
- @recent_users = @users.limit(10)
- @active_users = @users.order(:updated_at).limit(10)
- @recent_activities = Activity.order(:created_at => :desc).limit(10)
expires_in(10.minutes)
end
+
+ def show
+ @user = User.find(params[:id])
+ end
end
end
app/views/admin/users/index.html.erb
@@ -20,16 +20,7 @@
<tr>
<td><%= user.sign_in_count %></td>
<td><%= user.creations_count %></td>
- <td>
- <p><%= user.name %></p>
- <!--
- <p><%= user.full_address %></p>
- <p><%= user.city %></p>
- <p><%= link_to(user.website, user.website) if user.website.present? %></p>
- <p><%= user.twitter if user.twitter.present? %></p>
- <p><%= link_to(user.facebook, user.facebook) if user.facebook.present? %></p>
- -->
- </td>
+ <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>
app/views/admin/users/show.html.erb
@@ -0,0 +1,15 @@
+<div class="row-fluid">
+ <div class="span12">
+ <h1><%= @user.name %></h1>
+ <p><%= link_to "<< Back", admin_users_path %></p>
+ </div>
+</div>
+
+<div class="row-fluid">
+ <div class="span3">
+ <%= avatar_for(@user) %>
+ </div>
+ <div class="span9">
+ <%= debug @user %>
+ </div>
+</div>
config/routes.rb
@@ -62,7 +62,7 @@ Cake::Application.routes.draw do
namespace :admin do
root :to => "users#index"
- resources :users, only: [:index]
+ resources :users, only: [:index, :show]
resources :jobs, only: [:index, :show]
resources :activities, only: [:index]
resources :subscriptions, only: [:index]