diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-05 15:53:45 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-05 15:53:45 -0400 |
| commit | 7eff9bd40e71ad8b73dc2dd1818fd668e7b09338 (patch) | |
| tree | e40b93caf53246a56b8ed44173be4a6816364748 /app | |
| parent | 4d51d53103ed16f07cb41662697038e17027d562 (diff) | |
Updated Settings, renaming, tournament views and misc.
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/game.rb | 1 | ||||
| -rw-r--r-- | app/models/user.rb | 1 | ||||
| -rw-r--r-- | app/views/tournaments/_selected.html.erb | 33 |
3 files changed, 28 insertions, 7 deletions
diff --git a/app/models/game.rb b/app/models/game.rb index a181c26..ec865d8 100644 --- a/app/models/game.rb +++ b/app/models/game.rb @@ -1,2 +1,3 @@ class Game < ActiveRecord::Base + has_many :settings, class_name: "GameSetting" end diff --git a/app/models/user.rb b/app/models/user.rb index d1698bd..bae4eac 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -14,6 +14,7 @@ class User < ActiveRecord::Base end def can?(action) + return true case action when :create_tournament when :edit_tournament 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 %> |