Merge branch 'master' of github.com:LukeShu/leager

1 files changed, 2 insertions, 7 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 27ba020..5c53693 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -15,6 +15,7 @@ class TournamentsController < ApplicationController
   # GET /tournaments/new
   def new
     @game_names = Game.all.collect
+    @game = params[:game]
     @tournament = Tournament.new
   end
 
@@ -22,12 +23,6 @@ class TournamentsController < ApplicationController
   def edit
   end
 
-  def selected
-    render :update do |page|
-      page.replace_html 'ajax-form', :partial => 'selected'
-    end
-  end
-
   # POST /tournaments
   # POST /tournaments.json
   def create
@@ -76,6 +71,6 @@ class TournamentsController < ApplicationController
 
     # Never trust parameters from the scary internet, only allow the white list through.
     def tournament_params
-      params.require(:tournament).permit(:game_id)
+      params.require(:tournament).permit(:game_id, :game)
     end
 end