summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorguntasgrewal <guntasgrewal@gmail.com>2014-04-06 23:30:47 -0400
committerguntasgrewal <guntasgrewal@gmail.com>2014-04-06 23:30:47 -0400
commit3602d46e95f9a13ec2a8ff0b0909059af64c55ba (patch)
tree1dbf1149e8f6915f0c07b7a9aef1bf790a7b41c5 /app/views
parent2d097c71a32646fce3b90608cbffde9992c979ef (diff)
parentedec37791164f1c32c8071784a8a02aa63afae55 (diff)
Merge branch 'master' of https://github.com/LukeShu/leaguer
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 %>