diff options
author | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 22:21:39 -0500 |
---|---|---|
committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-06 22:21:39 -0500 |
commit | e7562550fdaff859b0ead5a37e58c5f2b920ca80 (patch) | |
tree | b68d699bf397b7167a8713d789770b7ca59bdb16 /app/models/user.rb | |
parent | 4b672af0e7893a9db1c059c97b06afeafb9c742c (diff) | |
parent | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/user.rb')
-rw-r--r-- | app/models/user.rb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/user.rb b/app/models/user.rb index bad7f7b..ff212e4 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -1,6 +1,6 @@ class User < ActiveRecord::Base - has_many :user_tournament_pairs - has_many :tournaments, :through => :user_tournament_pairs + has_and_belongs_to_many :tournaments_played, class_name: "Tournament", foreign_key: "tournament_id", join_table: "players_tournaments" + has_and_belongs_to_many :tournaments_hosted, class_name: "Tournament", foreign_key: "tournament_id", join_table: "hosts_tournaments" before_save { self.email = email.downcase } before_save { self.user_name = user_name } |