diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-26 20:27:09 -0400 |
| commit | 0776c57b939208736db60d38b4530e8b1c306ec6 (patch) | |
| tree | 6a831d94039c9c86175b73af0aab525e6bd78983 /app/views/tournaments | |
| parent | 853c307700fa81b924e00bf430c878a3b7029ffe (diff) | |
| parent | 62219ac4e3af36cc15c9ad61701550bee9a8424c (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
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 | 4 | ||||
| -rw-r--r-- | app/views/tournaments/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/tournaments/show.json.jbuilder | 2 |
3 files changed, 6 insertions, 2 deletions
diff --git a/app/views/tournaments/_form.html.erb b/app/views/tournaments/_form.html.erb index 9b9681c..7127d38 100644 --- a/app/views/tournaments/_form.html.erb +++ b/app/views/tournaments/_form.html.erb @@ -51,6 +51,10 @@ <%= f.label :sampling_method %><br> <%= f.text_field :sampling_method %> </div> + <div class="field"> + <%= f.label :scoring_method %><br> + <%= f.text_field :scoring_method %> + </div> <div class="actions"> <%= f.submit %> </div> diff --git a/app/views/tournaments/index.json.jbuilder b/app/views/tournaments/index.json.jbuilder index 7118ecc..bd86e04 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 + 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.url tournament_url(tournament, format: :json) end diff --git a/app/views/tournaments/show.json.jbuilder b/app/views/tournaments/show.json.jbuilder index 4542e52..ff82412 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, :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, :set_rounds, :randomized_teams, :sampling_method, :scoring_method, :created_at, :updated_at |