diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:50:21 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:50:21 -0400 |
commit | 9d226fcd27b6c2470edf718ad36a262348891470 (patch) | |
tree | bb17fce921d0017b6e9111bd81edc194c07f61d3 /app/controllers | |
parent | 136b86453000aa6ad3a099efb96d85232eb2eeb5 (diff) |
re-factor for tournament_stage's and separate scheduling modules
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/matches_controller.rb | 6 | ||||
-rw-r--r-- | app/controllers/tournaments_controller.rb | 9 |
2 files changed, 6 insertions, 9 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index d7a8b99..e95f24a 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -8,12 +8,6 @@ class MatchesController < ApplicationController # GET /tournaments/1/matches # GET /tournaments/1/matches.json def index - @matches = @tournament.matches - # depth of SVG tree - @depth = Math.log2(@matches.count).floor+1; - # height of SVG - @height = 200 * 2**Math.log2(@matches.count).floor + 100; - @h_sector = 2**(@depth-1)+1 end # For compatability with the router assumptions made by ApplicationController#check_permission diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index b6f911f..4b0e1af 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -96,10 +96,13 @@ class TournamentsController < ApplicationController when "start" check_permission(:edit, @tournament) @tournament.status = 1 - @tournament.save + ok = + @tournament.save && + @tournament.tournament_stages.create(scheduling: "elimination") && + @tournament.tournament_stages.first.create_matches respond_to do |format| - if @tournament.setup - format.html { redirect_to @tournament, notice: 'You have joined this tournament.' } + if ok + format.html { redirect_to @tournament, notice: 'You have started this tournament.' } format.json { head :no_content } else format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." } |