diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-22 11:46:11 -0400 |
commit | db45b2441bd57a5e640b529ef6239c98a3030fe2 (patch) | |
tree | bcffce81e433821f6ddd9a6588b40ee1d5f84592 /app/views/matches | |
parent | 4aeaf0e41518695c3c6ba3b09025516f67b06a11 (diff) | |
parent | 474a048ae4a4fae86e7fde93745f0ea79c7ed717 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/matches')
-rw-r--r-- | app/views/matches/_form.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 |
4 files changed, 6 insertions, 6 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index c9c4aac..88fe733 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -5,8 +5,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.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 ba1ff9b..e7fe791 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -3,8 +3,8 @@ <%= @match.status %> </p> <p> - <strong>Tournament:</strong> - <%= @match.tournament.id %> + <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 |