summaryrefslogtreecommitdiff
path: root/app/models
diff options
context:
space:
mode:
authorLuke Shumaker <shumakl@purdue.edu>2014-04-05 21:49:01 -0400
committerLuke Shumaker <shumakl@purdue.edu>2014-04-05 21:49:01 -0400
commitf25e9db11971e073d386f4d977f277939678f025 (patch)
tree68bfd5a61adff032a43ab08bba475386933bb268 /app/models
parent18d76defd43cb747824a355b2d320c5cf2c55d6a (diff)
parent94d5a5012910b531aaeb040ed01f821dde45961e (diff)
Merge branch 'master' of github.com:LukeShu/leaguer
Diffstat (limited to 'app/models')
-rw-r--r--app/models/game.rb1
-rw-r--r--app/models/tournament.rb5
-rw-r--r--app/models/user.rb4
3 files changed, 9 insertions, 1 deletions
diff --git a/app/models/game.rb b/app/models/game.rb
index a181c26..ec865d8 100644
--- a/app/models/game.rb
+++ b/app/models/game.rb
@@ -1,2 +1,3 @@
class Game < ActiveRecord::Base
+ has_many :settings, class_name: "GameSetting"
end
diff --git a/app/models/tournament.rb b/app/models/tournament.rb
index 22711b1..e408cfe 100644
--- a/app/models/tournament.rb
+++ b/app/models/tournament.rb
@@ -25,7 +25,7 @@ class Tournament < ActiveRecord::Base
end
end
- def setup()
+ def setup
num_teams = (self.players.count/self.min_players_per_team).floor
num_matches = num_teams - 1
for i in 1..num_matches
@@ -33,8 +33,11 @@ class Tournament < ActiveRecord::Base
end
match_num = 0
team_num = 0
+ #for each grouping of min_players_per_team
self.players.each_slice(min_players_per_team) do |players|
+ #create a new team in the current match
self.matches[match_num].teams.push(Team.create(users: players))
+ #if the match is full, move to the next match, otherwise move to the next team
if (team_num != 0 and team_num % max_teams_per_match == 0)
match_num += 1
team_num = 0
diff --git a/app/models/user.rb b/app/models/user.rb
index d1698bd..64dd7ed 100644
--- a/app/models/user.rb
+++ b/app/models/user.rb
@@ -14,10 +14,14 @@ class User < ActiveRecord::Base
end
def can?(action)
+ return true
case action
when :create_tournament
+ return true
when :edit_tournament
+ return true
when :join_tournament
+ return true
when :delete_tournament
when :create_game