From 5779c99896960e4bbebc2cef21bd236cb8e20e32 Mon Sep 17 00:00:00 2001 From: Stella Rouzi Date: Sun, 27 Jul 2014 09:06:15 +0300 Subject: [PATCH] put all associations together in the user model --- app/models/user.rb | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/app/models/user.rb b/app/models/user.rb index fac2dbb3..4798a809 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -12,12 +12,11 @@ class User < ActiveRecord::Base :recoverable, :rememberable, :trackable, :validatable, :confirmable, :omniauthable, omniauth_providers: [:novell, :google, :facebook] - has_and_belongs_to_many :roles - has_many :openids - attr_accessible :email, :password, :password_confirmation, :remember_me, :role_id, :role_ids, :name, :email_public, :biography, :nickname, :affiliation + has_and_belongs_to_many :roles + has_many :openids has_many :event_users, dependent: :destroy has_many :events, -> { uniq }, through: :event_users has_many :registrations, dependent: :destroy