Merge branch 'master' of http://github.com/LukeShu/leaguer

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 }