diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-03 16:49:07 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-03 16:49:07 -0400 |
| commit | ef0cc1035632d7b59a5977038ac30fe1292d0128 (patch) | |
| tree | cc4b6f1105defaa7ac56afa141d2416a7f956f9d /app/models/tournament.rb | |
| parent | 9d2e1394bc09d4df3fce97d6151f5bfc3546fbe8 (diff) | |
| parent | d6009eddd6f67a9414ff7d707ae82c053e6653ad (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/models/tournament.rb')
| -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) |