diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-26 20:57:26 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-26 20:57:26 -0400 |
| commit | 31d458e59077340f28955033735f5c433197cb75 (patch) | |
| tree | 8784a35b5d50f32ce693c0427b277f7238c6d691 /app/controllers/tournaments_controller.rb | |
| parent | 00f3d70445d7cae0976ec9794e555c52a1765b24 (diff) | |
| parent | edcca83c6c251a79afcd83760cf20ebaf00b3b32 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/tournaments_controller.rb')
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 1354ad6..60f8789 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -116,7 +116,8 @@ class TournamentsController < ApplicationController success = true ActiveRecord::Base.transaction do success &= @tournament.save && - success &= @tournament.stages.create(scheduling: "elimination") + sched = tournament_attribute_params[:type_opt] + success &= @tournament.stages.create(scheduling: sched) success &= @tournament.stages.first.create_matches end if success @@ -162,7 +163,7 @@ class TournamentsController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def tournament_attribute_params if params[:tournament] - params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method) + params.require(:tournament).permit(:game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :set_rounds, :randomized_teams, :sampling_method, :scoring_method) else return {} end |