fix the has_and_belongs_to_many relations

1 files changed, 3 insertions, 4 deletions

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<<user
 	end
 end