From 112708eb525c2a77e5e0f06f5e4683b31ee977c6 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 26 Oct 2012 06:43:01 -0400 Subject: [PATCH] made show user show whoevers page you're on --- app/controllers/users_controller.rb | 2 +- db/schema.rb | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 245550b8..511391fc 100644 --- a/app/controllers/users_controller.rb +++ b/app/controllers/users_controller.rb @@ -21,7 +21,7 @@ class UsersController < ApplicationController # GET /user def show - @user = current_user + @user = User.find(params[:user_id]) respond_with(@user) end diff --git a/db/schema.rb b/db/schema.rb index 0b29163d..56cf4c79 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -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