diff options
| author | shumakl <shumakl@purdue.edu> | 2014-04-03 16:45:23 -0400 |
|---|---|---|
| committer | shumakl <shumakl@purdue.edu> | 2014-04-03 16:45:23 -0400 |
| commit | d6009eddd6f67a9414ff7d707ae82c053e6653ad (patch) | |
| tree | 8bfc4541288ed9bb430c1047aa193b092ec423c8 /app/models | |
| parent | dfe5dbd2ada1841b09f70bfd742c10ba878f74fe (diff) | |
| parent | dacab01db3ac4b9d9e2281daff74230a003f138e (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Diffstat (limited to 'app/models')
| -rw-r--r-- | app/models/tournament.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/tournament.rb b/app/models/tournament.rb index 87b516e..4483535 100644 --- a/app/models/tournament.rb +++ b/app/models/tournament.rb @@ -9,7 +9,7 @@ class Tournament < ActiveRecord::Base end def joinable_by?(user) - return ((not user.nil?) and user.in_group?(:player) and open?) + return ((not user.nil?) and user.in_group?(:player) and open? and !players.include?(user)) end def join(user) |