diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-27 13:30:07 -0400 |
commit | 8c1d3841142f06752cca7b521f420d2838928223 (patch) | |
tree | 8281b59d3c241861bb610cb912cc4779bdc2d338 /app/views/tournaments | |
parent | eacf4fcc2a45142cd865795f35d65341dfe665ad (diff) | |
parent | 9a8d6814511ce257241a03b5763430294ed3e381 (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/index.json.jbuilder | 2 | ||||
-rw-r--r-- | app/views/tournaments/show.html.erb | 6 | ||||
-rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
3 files changed, 2 insertions, 8 deletions
diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index bd86e04..c6b9e68 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, :set_rounds, :randomized_teams, :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, :sampling_method, :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 f79b975..53389bb 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -45,12 +45,6 @@ <%= @tournament.max_teams_per_match %> </p> - -<p> - <strong>Randomized teams:</strong> - <%= @tournament.randomized_teams %> -</p> - <p> <strong>Sampling method:</strong> <!-- TODO --> diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index ff82412..afc5814 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, :set_rounds, :randomized_teams, :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, :sampling_method, :scoring_method, :created_at, :updated_at |