diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-22 15:56:06 -0400 |
| commit | 45c5d311492ef98ed702beaf043d289a705a5e0b (patch) | |
| tree | c0bea2e65d21127a1fd34a245b5bb7fc47123bb0 /app/views/matches | |
| parent | 9d226fcd27b6c2470edf718ad36a262348891470 (diff) | |
| parent | c927cd7c043d982f8ffb51c8a78288d88d825d82 (diff) | |
Merge branch 'clean2'
Conflicts:
app/models/team.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/matches')
| -rw-r--r-- | app/views/matches/_form.html.erb | 6 | ||||
| -rw-r--r-- | app/views/matches/index.html.erb | 2 | ||||
| -rw-r--r-- | app/views/matches/index.json.jbuilder | 2 | ||||
| -rw-r--r-- | app/views/matches/show.json.jbuilder | 2 |
4 files changed, 4 insertions, 8 deletions
diff --git a/app/views/matches/_form.html.erb b/app/views/matches/_form.html.erb index 88fe733..9d402b3 100644 --- a/app/views/matches/_form.html.erb +++ b/app/views/matches/_form.html.erb @@ -9,16 +9,12 @@ <%= f.text_field :tournament_stage_id %> </div> <div class="field"> - <%= f.label :name %><br> - <%= f.text_field :name %> - </div> - <div class="field"> <%= f.label :winner_id %><br> <%= f.text_field :winner_id %> </div> <div class="field"> <%= f.label :remote_id %><br> - <%= f.text_field :remote_id %> + <%= f.text_area :remote_id %> </div> <div class="field"> <%= f.label :submitted_peer_evaluations %><br> diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index cebabb3..abca42b 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -13,7 +13,7 @@ <tbody class="table-hover"> <% @tournament.matches.order(:id).reverse.each do |match| %><tr> - <td><%= match.name %></td> + <td><%= "Match #{match.id}" %></td> <td><%= match.status %></td> <td><%= (match.winner.nil? ? "-" : "Team #{match.winner.id}") %></td> <td><%= link_to "Show", tournament_match_path(@tournament, match) %> diff --git a/app/views/matches/index.json.jbuilder b/app/views/matches/index.json.jbuilder index f2499ac..bef149d 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_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations + json.extract! match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations json.url match_url(match, format: :json) end diff --git a/app/views/matches/show.json.jbuilder b/app/views/matches/show.json.jbuilder index 5b543ea..145f069 100644 --- a/app/views/matches/show.json.jbuilder +++ b/app/views/matches/show.json.jbuilder @@ -1 +1 @@ -json.extract! @match, :id, :status, :tournament_stage_id, :name, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at +json.extract! @match, :id, :status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :created_at, :updated_at |