diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 09:37:52 -0400 |
commit | f8e9b0349b82278c8fb015037e901dd5a77e30e7 (patch) | |
tree | c54eae2919f7d6a8532527ec4db7b33c26b71a71 /app/views/tournaments | |
parent | 8abfaf4ce71dff7294424a7cb37efe4db5e0d581 (diff) | |
parent | e08e007a6c50e1959a29a9d18dec8c52146a233c (diff) |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/views/tournaments/_form.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
Diffstat (limited to 'app/views/tournaments')
-rw-r--r-- | app/views/tournaments/_form.html.erb | 6 | ||||
-rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/tournaments/show.html.erb | 4 | ||||
-rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
4 files changed, 4 insertions, 10 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index a5eba7a..38f01ee 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -57,12 +57,6 @@ <%= f.label :scoring_method %> <%= f.select(:scoring_method, @tournament.scoring_methods.map{|method| [method.humanize.titleize, method]}) %> </p> - - <p> - <%= f.label :sampling_method %> - <%= f.select(:sampling_method, @tournament.sampling_methods.map{|method| [method.humanize, method]}) %> - </p> - </fieldset> <fieldset> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index c6b9e68..f92397f 100644 --- a/app/views/tournaments/index.json.jbuilder +++ b/app/views/tournaments/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@tournaments) do |tournament| - json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method + json.extract! tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :scoring_method json.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index c71d3c6..ec83dc0 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -46,8 +46,8 @@ </p> <p> - <strong>Sampling method:</strong> - <%= @tournament.sampling_method.humanize.capitalize %> + <strong>Scoring method:</strong> + <%= @tournament.scoring_method.titleize %> </p> <% @tournament.settings.each do |setting| %> diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index afc5814..888c6b2 100644 --- a/app/views/tournaments/show.json.jbuilder +++ b/app/views/tournaments/show.json.jbuilder @@ -1 +1 @@ -json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :sampling_method, :scoring_method, :created_at, :updated_at +json.extract! @tournament, :id, :game_id, :status, :name, :min_players_per_team, :max_players_per_team, :min_teams_per_match, :max_teams_per_match, :scoring_method, :created_at, :updated_at |