Merge branch 'master' of https://github.com/LukeShu/Leaguer

3 files changed, 16 insertions, 8 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 03dc5b8..b276368 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -32,7 +32,11 @@ class TournamentsController < ApplicationController
 	# GET /tournaments/new
 	def new
 		@games = Game.all
-		@tournament = Tournament.new(game: Game.find_by_id(params[:game]))  
+		if params[:tournament]
+			@tournament = Tournament.new(game: Game.find(params[:tournament][:game_id]))
+		else
+			@tournament = Tournament.new()
+		end
 	end
 
 	# GET /tournaments/1/edit
@@ -146,7 +150,12 @@ class TournamentsController < ApplicationController
 
 	# Never trust parameters from the scary internet, only allow the white list through.
 	def tournament_params
-		params.require(:tournament).permit(:game, :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)
+		permitted = [: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]
+		if params[:tournament][:game_id]
+			game = Game.find(params[:tournament][:game_id])
+			permitted.push(:settings => game.settings.collect{|s| s.name})
+		end
+		params.require(:tournament).permit(permitted)
 	end
 
 	def is_owner?(object)
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 4efd17a..9240c49 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -2,18 +2,17 @@
   <%= render "common/error_messages", :target => @tournament %>
   <%= f.hidden_field(:game_id) %>
 
-  <% @game = Game.find(params[:game]) %>
   <% @tournament.attributes.each do |name, value| %>
     <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") or (name == "set_rounds") %>
       <% next %>
     <% end %>
     <p>
       <%= f.label name %><br>
-      <% unless @game.attributes[name].nil? %>
+      <% unless @tournament.game.attributes[name].nil? %>
         <% if name == "sampling_method" %>
-          <%= f.select( name, @game.sampling_method.split(',') ) %>
+          <%= f.select( name, @tournament.game.sampling_method.split(',') ) %>
         <% else %>
-        <%= f.text_field(name, :value => @game.attributes[name] ) %>
+        <%= f.text_field(name, :value => @tournament.game.attributes[name] ) %>
         <% end %>
       <% else %>
         <%= f.text_field name %>
@@ -22,7 +21,7 @@
   <% end %>
 
   <%= fields_for "tournament[settings]", @tournament.settings do |setting_fields|  %>
-    <% @game.settings.each do |setting| %>
+    <% @tournament.game.settings.each do |setting| %>
       <p>
       <%= setting_fields.label setting.name %>
       <br>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index 8c74068..66149fe 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -1,7 +1,7 @@
 <h1>New Tournament</h1>
 
 <%= form_tag(new_tournament_path, method: "get") do %>
-	<%= select_tag('game',
+	<%= select_tag('tournament[game_id]',
 	                options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id),
 	                :prompt => "Select a Game Type") %>
 	<%= submit_tag("Select", :class => "btn btn-success btn-xs") %>