diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:18:48 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:18:48 -0400 |
| commit | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (patch) | |
| tree | a3e0642ae64bef2bdda4b359f6712d5b09c5a70a /app/views/matches | |
| parent | 96274bb53465d90632908ebc2f8fd9811d7a5bcb (diff) | |
run ./generate.sh
Diffstat (limited to 'app/views/matches')
| -rw-r--r-- | app/views/matches/_form.html.erb | 4 | ||||
| -rw-r--r-- | app/views/matches/index.html.erb | 4 | ||||
| -rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 4 | ||||
| -rw-r--r-- | app/views/matches/show.json.jbuilder | 2 |
5 files changed, 8 insertions, 8 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index bb33501..65069d1 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -16,8 +16,8 @@ <%= f.number_field :status %> </div> <div class="field"> - <%= f.label :tournament_id %><br> - <%= f.text_field :tournament_id %> + <%= f.label :tournament_stage_id %><br> + <%= f.text_field :tournament_stage_id %> </div> <div class="field"> <%= f.label :name %><br> diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 7b7676a..414d57d 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -4,7 +4,7 @@ <thead> <tr> <th>Status</th> - <th>Tournament</th> + <th>Tournament stage</th> <th>Name</th> <th>Winner</th> <th>Remote</th> @@ -19,7 +19,7 @@ <% @matches.each do |match| %> <tr> <td><%= match.status %></td> - <td><%= match.tournament %></td> + <td><%= match.tournament_stage %></td> <td><%= match.name %></td> <td><%= match.winner %></td> <td><%= match.remote_id %></td> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index 8efb8f9..f2499ac 100644 --- a/app/views/matches/index.json.jbuilder +++ b/app/views/matches/index.json.jbuilder @@ -1,4 +1,4 @@ json.array!(@matches) do |match| - json.extract! match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 1164113..3356e28 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -6,8 +6,8 @@ </p> <p> - <strong>Tournament:</strong> - <%= @match.tournament %> + <strong>Tournament stage:</strong> + <%= @match.tournament_stage %> </p> <p> diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index 37496c9..5b543ea 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at |