diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-03-07 00:31:47 -0500 |
| commit | 1ecd3d50d0ac73968362f885c9f60ec38253be9a (patch) | |
| tree | 324f79ad4d4da1af623fc93f215643287d6210f3 /app/views/matches/index.html.erb | |
| parent | b2e0b1397596ee8f624ef4de122cc71599d4dc0d (diff) | |
| parent | c1f714a479eb7ca9e9125e283361a471dd928278 (diff) | |
Merge branch 'clean'
Conflicts:
app/models/match.rb
app/views/matches/index.html.erb
app/views/matches/show.html.erb
Diffstat (limited to 'app/views/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index d635834..ff42ef1 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -5,6 +5,7 @@ <tr> <th>Tournament</th> <th>Name</th> + <th>Winner</th> <th></th> <th></th> <th></th> @@ -16,6 +17,7 @@ <tr> <td><%= match.tournament %></td> <td><%= match.name %></td> + <td><%= match.winner %></td> <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td> <td><%= link_to 'Edit', edit_tournament_match_path(@tournament, match) %></td> <td><%= link_to 'Destroy', tournament_match_path(@tournament, match), method: :delete, data: { confirm: 'Are you sure?' } %></td> |