made show user show whoevers page you're on

This commit is contained in:
Connor Turland 2012-10-26 06:43:01 -04:00
parent 73f18ce340
commit 112708eb52
2 changed files with 6 additions and 6 deletions

View file

@ -21,7 +21,7 @@ class UsersController < ApplicationController
# GET /user
def show
@user = current_user
@user = User.find(params[:user_id])
respond_with(@user)
end

View file

@ -11,7 +11,7 @@
#
# It's strongly recommended to check this file into your version control system.
ActiveRecord::Schema.define(:version => 20121026064859) do
ActiveRecord::Schema.define(:version => 20121026103129) do
create_table "item_categories", :force => true do |t|
t.text "name"
@ -35,20 +35,20 @@ ActiveRecord::Schema.define(:version => 20121026064859) do
t.text "category"
t.integer "xloc"
t.integer "yloc"
t.integer "item_id"
t.integer "synapse_id"
t.integer "map_id"
t.integer "user_id"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "item_id"
t.integer "synapse_id"
end
create_table "maps", :force => true do |t|
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.text "name"
t.text "desc"
t.text "permission"
t.datetime "created_at", :null => false
t.datetime "updated_at", :null => false
t.integer "user_id"
end