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

1 files changed, 11 insertions, 2 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)