summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-06 22:20:24 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-06 22:20:24 -0400
commit91fee659eadaf6bcc4d063fd5645950da1250896 (patch)
treebf1df15fd055199fc07d971623bfd6632dc3dee4 /app/views
parent0d42079611ed2aeacd71b926580fdc3b943cf1ba (diff)
A few bug fixes, and a bunch of code that almost works.
Diffstat (limited to 'app/views')
-rw-r--r--app/views/tournaments/_selected.html.erb23
1 files changed, 2 insertions, 21 deletions
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 3661077..b66acb0 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -2,7 +2,7 @@
<%= render "common/error_messages", :target => @tournament %>
<%= f.hidden_field(:game_id) %>
- <% @game = Game.find_by(params[:game]) %>
+ <% @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 %>
@@ -17,24 +17,5 @@
</p>
<% end %>
- <% @settings = GameSetting.find_by(params[:game_id]) %>
- <% unless @settings %>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <br>
- <% end %>
- <% @settings.each do |setting| %>
- <p>
- <%= f.label setting.name %><br>
- <% #eventually display by non-generic input method %>
- <%= f.select :setting options_from_collection_for_select([setting.description, ""].append setting.type_opt.split(',')) %>
- </p>
- <% end %>
-
- <%= f.submit %>
+ <%= f.submit %>
<% end %>