Merge branch 'master' of https://github.com/LukeShu/leaguer

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 %>