diff options
author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
---|---|---|
committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 21:30:30 -0500 |
commit | 5f8baf6334f427506193ea8efd1356812468e191 (patch) | |
tree | 216b749f9d589739eefa69e02122ed60654a2d9b /app/views/tournaments/index.html.erb | |
parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
parent | c9f2abad7b9c967e23ed2b2867d426eb27f61387 (diff) |
Merge branch 'clean'
Conflicts:
app/controllers/tournaments_controller.rb
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> |