diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 02:45:22 -0400 |
| commit | 7d40d2ed8bd686b32ff9bc620936a72044a610bc (patch) | |
| tree | 4e46ac6a1fca51e272837ef0d8f5921f3991e914 /app/views/matches | |
| parent | d3bee0f1ce0c5dc3fa741338bc6d9914e9e92787 (diff) | |
| parent | 07476fd9a2b942e8d6056804bb1cdbd5e9a1c528 (diff) | |
Merge branch 'clean2'
Conflicts:
app/controllers/tournaments_controller.rb
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
app/views/tournaments/index.html.erb
app/views/tournaments/show.html.erb
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 |