From 734729119cbc31e847fd46609b598573f365bdc4 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <shumakl@purdue.edu>
Date: Wed, 23 Apr 2014 19:32:28 -0400
Subject: tournaments: unify params[:game] and params[:tournament][:game_id]

---
 app/views/tournaments/_selected.html.erb | 9 ++++-----
 app/views/tournaments/new.html.erb       | 2 +-
 2 files changed, 5 insertions(+), 6 deletions(-)

(limited to 'app/views')

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") %>
-- 
cgit v1.2.3-54-g00ecf