diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-05 21:49:01 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-05 21:49:01 -0400 |
| commit | f25e9db11971e073d386f4d977f277939678f025 (patch) | |
| tree | 68bfd5a61adff032a43ab08bba475386933bb268 /app/views/tournaments | |
| parent | 18d76defd43cb747824a355b2d320c5cf2c55d6a (diff) | |
| parent | 94d5a5012910b531aaeb040ed01f821dde45961e (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Diffstat (limited to 'app/views/tournaments')
| -rw-r--r-- | app/views/tournaments/_selected.html.erb | 33 |
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 %> |