diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-06 22:34:08 -0500 |
commit | 3ce5876375cbb3057ffc96e2886ba57cbd875dc9 (patch) | |
tree | e59dc46b293cdcd4ad8ad5b33bd4703f65adb0d9 /app/views/tournaments/index.html.erb | |
parent | ce8b05ed8fa3466c727269daa47ba7df672fdca1 (diff) | |
parent | 70bae69d731afc5300ffa5b176732ebe27d0810f (diff) |
Fixed some merge errors in show.html.erb
Diffstat (limited to 'app/views/tournaments/index.html.erb')
-rw-r--r-- | app/views/tournaments/index.html.erb | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 80d68a3..452d939 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -5,13 +5,13 @@ <thead> <tr> <th>Game</th> + <th>Status</th> <th>Min players per team</th> <th>Max players per team</th> <th>Min teams per match</th> <th>Max teams per match</th> <th>Set rounds</th> <th>Randomized teams</th> - <th>Status</th> <th></th> <th></th> <th></th> @@ -22,13 +22,13 @@ <% @tournaments.each do |tournament| %> <tr> <td><%= tournament.game %></td> + <td><%= tournament.status %></td> <td><%= tournament.min_players_per_team %></td> <td><%= tournament.max_players_per_team %></td> <td><%= tournament.min_teams_per_match %></td> <td><%= tournament.max_teams_per_match %></td> <td><%= tournament.set_rounds %></td> <td><%= tournament.randomized_teams %></td> - <td><%= tournament.status %></td> <td><%= link_to 'Show', tournament %></td> <td><%= link_to 'Edit', edit_tournament_path(tournament) %></td> <td><%= link_to 'Destroy', tournament, method: :delete, data: { confirm: 'Are you sure?' } %></td> |