From 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 Mon Sep 17 00:00:00 2001 From: Luke Shumaker Date: Tue, 22 Apr 2014 02:18:48 -0400 Subject: run ./generate.sh --- app/views/matches/_form.html.erb | 4 ++-- app/views/matches/index.html.erb | 4 ++-- app/views/matches/index.json.jbuilder | 2 +- app/views/matches/show.html.erb | 4 ++-- app/views/matches/show.json.jbuilder | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) (limited to 'app/views/matches') 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 %>
- <%= f.label :tournament_id %>
- <%= f.text_field :tournament_id %> + <%= f.label :tournament_stage_id %>
+ <%= f.text_field :tournament_stage_id %>
<%= f.label :name %>
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 @@ Status - Tournament + Tournament stage Name Winner Remote @@ -19,7 +19,7 @@ <% @matches.each do |match| %> <%= match.status %> - <%= match.tournament %> + <%= match.tournament_stage %> <%= match.name %> <%= match.winner %> <%= match.remote_id %> 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 @@

- Tournament: - <%= @match.tournament %> + Tournament stage: + <%= @match.tournament_stage %>

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 -- cgit v1.2.3-54-g00ecf