summaryrefslogtreecommitdiff
path: root/app/controllers/tournaments_controller.rb
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-03-04 18:57:50 -0500
committerAndrewMurrell <amurrel@purdue.edu>2014-03-04 18:57:50 -0500
commite586c3e2b30698ea5a1c83c19ea446c4be89fd54 (patch)
tree749a343dbcd93f461930e8c6ff11ebb41f2af8da /app/controllers/tournaments_controller.rb
parent4cdd4e361ad691d524f9ee6163b40ef78d9938c4 (diff)
Here's to messing everything up.
Diffstat (limited to 'app/controllers/tournaments_controller.rb')
-rw-r--r--app/controllers/tournaments_controller.rb9
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