summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--app/controllers/tournaments_controller.rb1
-rw-r--r--app/views/tournaments/_form.html.erb15
2 files changed, 8 insertions, 8 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 5eba07c..e115f18 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -171,6 +171,7 @@ class TournamentsController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def tournament_attribute_params
+ params[:num_stages] ||= 1
if params[:tournament]
p = 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)
if p[:game_id]
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb
index b8d6fc1..95bb7c7 100644
--- a/app/views/tournaments/_form.html.erb
+++ b/app/views/tournaments/_form.html.erb
@@ -49,7 +49,7 @@
</fieldset>
<fieldset><legend>Settings</legend>
- <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields| %>
+ <%= f.fields_for :settings do |setting_fields| %>
<% (@tournament.settings.empty? ? @tournament.game.settings : @tournament.settings).each do |setting| %><p>
<% name = setting.name.parameterize.underscore %>
<%= setting_fields.label name %>
@@ -81,20 +81,19 @@
<% end %>
</fieldset>
- <fieldset><legend>Stages</legend>
+ <%= f.fields_for :stages do |stages_fields| %><fieldset><legend>Stages</legend>
<label for="num_stages">Number of tournament stages</label>
- <input type="number" name="num_stages" min="1" value="<%= params[:num_stages] ? params[:num_stages].to_i : 1 %>">
+ <input type="number" name="num_stages" min="1" value="<%= params[:num_stages].to_i %>">
<% for i in 1..(params[:num_stages].to_i) do %>
- <%= fields_for "tournament[stages][#{i}]", @tournament.stages[i] do |stage_fields| %>
- <fieldset><legend>Stage <%= i %></legend>
+ <%= stages_fields.fields_for i.to_s do |stage_fields| %><fieldset><legend>Stage <%= i %></legend>
<%= stage_fields.label :scheduling_method %>
<%= stage_fields.select(:scheduling_method, @tournament.scheduling_methods.map{|method| [method.humanize, method]}) %>
<%= stage_fields.label :seeding_method %>
<%= stage_fields.select(:seeding_method, @tournament.seeding_methods.map{|method| [method.humanize, method]}) %>
- </fieldset>
- <% end %>
+ </fieldset><% end %>
<% end %>
- </fieldset>
+ </fieldset><% end %>
+
<%= f.submit %>
<%# render 'stages' %>