From 64d4bd0d7bff0bf0e1c405bfa154f22775ca724e Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Mar 2014 21:31:18 -0500 Subject: use had_and_belongs_to_many --- app/models/user.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'app/models/user.rb') diff --git a/app/models/user.rb b/app/models/user.rb index bad7f7b..0a226e5 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", join_table: "tournaments_players" + has_and_belongs_to_many :tournaments_hosted, class_name: "Tournament", join_table: "tournaments_hosts" before_save { self.email = email.downcase } before_save { self.user_name = user_name } -- cgit v1.2.3-54-g00ecf From 4a91128f6fe20d95b6692abaa5e6c4dc92418b46 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Thu, 6 Mar 2014 22:14:58 -0500 Subject: fix the has_and_belongs_to_many relations --- app/models/tournament.rb | 7 +++---- app/models/user.rb | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) (limited to 'app/models/user.rb') diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 0510864..aa22afa 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -1,8 +1,8 @@ class Tournament < ActiveRecord::Base belongs_to :game has_many :matches - has_and_belongs_to_many :players, class_name: "User", join_table: "tournaments_players" - has_and_belongs_to_many :hosts, class_name: "User", join_table: "tournaments_hosts" + has_and_belongs_to_many :players, class_name: "User", association_foreign_key: "player_id", join_table: "players_tournaments" + has_and_belongs_to_many :hosts, class_name: "User", association_foreign_key: "host_id", join_table: "hosts_tournaments" def open? return true @@ -16,7 +16,6 @@ class Tournament < ActiveRecord::Base unless joinable_by?(user) return false end - pair = UserTournamentPair.new(tournament: self, user: user) - return pair.save + players<