From 402786a7c6a8e57064d99121d3fba86707a27664 Mon Sep 17 00:00:00 2001 From: Connor Turland Date: Fri, 26 Oct 2012 06:59:45 -0400 Subject: [PATCH] removed extra migrate file and made user show profile correctly --- app/controllers/users_controller.rb | 2 +- db/migrate/20121026103129_add_all_to_map.rb | 8 -------- 2 files changed, 1 insertion(+), 9 deletions(-) delete mode 100644 db/migrate/20121026103129_add_all_to_map.rb diff --git a/app/controllers/users_controller.rb b/app/controllers/users_controller.rb index 511391fc..883babe2 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 = User.find(params[:user_id]) + @user = User.find(params[:id]) respond_with(@user) end diff --git a/db/migrate/20121026103129_add_all_to_map.rb b/db/migrate/20121026103129_add_all_to_map.rb deleted file mode 100644 index 6cdd5f17..00000000 --- a/db/migrate/20121026103129_add_all_to_map.rb +++ /dev/null @@ -1,8 +0,0 @@ -class AddAllToMap < ActiveRecord::Migration - def self.up - add_column :maps, :name, :text - add_column :maps, :desc, :text - add_column :maps, :permission, :text - add_column :maps, :user_id, :integer - end -end