From f163d72d0b05af77829c0c8dbd34a69db63a5dcb Mon Sep 17 00:00:00 2001 From: Ravi Chandra Padmala Date: Sun, 25 Nov 2012 07:16:08 +0530 Subject: [PATCH] Remove email column and index. Fix schema. This prevented us from creating more than one user. --- app/controllers/tags_controller.rb | 7 +++++++ app/models/user.rb | 3 +++ db/migrate/20121125014228_remove_column_users_email.rb | 9 +++++++++ db/schema.rb | 4 +--- 4 files changed, 20 insertions(+), 3 deletions(-) create mode 100644 app/controllers/tags_controller.rb create mode 100644 db/migrate/20121125014228_remove_column_users_email.rb diff --git a/app/controllers/tags_controller.rb b/app/controllers/tags_controller.rb new file mode 100644 index 0000000..40580ad --- /dev/null +++ b/app/controllers/tags_controller.rb @@ -0,0 +1,7 @@ +class TagCloudController < ApplicationController + before_filter :authenticate_user! + def index + tags = User.find(current_user).links.tag_counts_on(:tags) + render :json => tags + end +end diff --git a/app/models/user.rb b/app/models/user.rb index a5e6fa1..d9eb0ca 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -9,4 +9,7 @@ class User < ActiveRecord::Base # attr_accessible :title, :body has_many :links, dependent: :destroy + def email_required? + false + end end diff --git a/db/migrate/20121125014228_remove_column_users_email.rb b/db/migrate/20121125014228_remove_column_users_email.rb new file mode 100644 index 0000000..add32be --- /dev/null +++ b/db/migrate/20121125014228_remove_column_users_email.rb @@ -0,0 +1,9 @@ +class RemoveColumnUsersEmail < ActiveRecord::Migration + def up + remove_column :users, :email + end + + def down + add_column :users, :email, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 8d47411..2adfb05 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 => 20121122175228) do +ActiveRecord::Schema.define(:version => 20121125014228) do create_table "links", :force => true do |t| t.string "url" @@ -41,7 +41,6 @@ ActiveRecord::Schema.define(:version => 20121122175228) do end create_table "users", :force => true do |t| - t.string "email", :default => "", :null => false t.string "encrypted_password", :default => "", :null => false t.string "reset_password_token" t.datetime "reset_password_sent_at" @@ -56,7 +55,6 @@ ActiveRecord::Schema.define(:version => 20121122175228) do t.string "username" end - add_index "users", ["email"], :name => "index_users_on_email", :unique => true add_index "users", ["reset_password_token"], :name => "index_users_on_reset_password_token", :unique => true end -- 2.11.4.GIT