diff options
author | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-04-23 22:53:04 -0400 |
commit | a6f801b7f5a2b9ca1b61ecc305a31f76be8c8238 (patch) | |
tree | 6f9fe728220b8d7d08e9da3ac3ac48f3a3128d5b /app/controllers/tournaments_controller.rb | |
parent | 107f1f65c93cbe118a69e76514327c4862c7d51d (diff) | |
parent | 41a93fad32677e3f351c0e16f0c704cbfbc5404e (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 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index b276368..0390051 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -33,7 +33,7 @@ class TournamentsController < ApplicationController def new @games = Game.all if params[:tournament] - @tournament = Tournament.new(game: Game.find(params[:tournament][:game_id])) + @tournament = Tournament.new(tournament_params) else @tournament = Tournament.new() end |