summaryrefslogtreecommitdiff
path: root/app/views/tournaments
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-05 15:53:45 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-05 15:53:45 -0400
commit7eff9bd40e71ad8b73dc2dd1818fd668e7b09338 (patch)
treee40b93caf53246a56b8ed44173be4a6816364748 /app/views/tournaments
parent4d51d53103ed16f07cb41662697038e17027d562 (diff)
Updated Settings, renaming, tournament views and misc.
Diffstat (limited to 'app/views/tournaments')
-rw-r--r--app/views/tournaments/_selected.html.erb33
1 files changed, 26 insertions, 7 deletions
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 8a704b5..3661077 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -2,18 +2,37 @@
<%= render "common/error_messages", :target => @tournament %>
<%= f.hidden_field(:game_id) %>
- <% @chosen = Game.find_by(params[:game]) %>
+ <% @game = Game.find_by(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>
- <% if !@chosen.attributes[name].nil? %>
- <%= f.text_field(name, :value => @chosen.attributes[name] ) %>
- <% else %>
- <%= f.text_field name %>
- <% end %>
+ <%= f.label name %><br>
+ <% if !@game.attributes[name].nil? %>
+ <%= f.text_field(name, :value => @game.attributes[name] ) %>
+ <% else %>
+ <%= f.text_field name %>
+ <% end %>
+ </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 %>