diff options
author | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 00:41:47 -0500 |
---|---|---|
committer | AndrewMurrell <amurrel@purdue.edu> | 2014-03-07 00:41:47 -0500 |
commit | fd213819fa004209fc466b19ee65d83b1f918068 (patch) | |
tree | ecfe47daa486da7d878207ac6a799b6fab79deab /app/views/tournaments | |
parent | 5ca9bd493d0348d56a3a8ce56923a72230515fe0 (diff) | |
parent | 8fc6b48caccdb8fbfe04e41282444e0b916883b3 (diff) |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/tournaments')
-rw-r--r-- | app/views/tournaments/_selected.html.erb | 2 | ||||
-rw-r--r-- | app/views/tournaments/index.html.erb | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb index 925e127..9b1b7f8 100644 --- a/app/views/tournaments/_selected.html.erb +++ b/app/views/tournaments/_selected.html.erb @@ -4,7 +4,7 @@ <% @chosen = Game.find_by(params[:game]) %> <% @tournament.attributes.each do |name, value| %> - <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "statuss") %> + <% if (name == "id") or (name =~ /.*_at$/) or (name == "game_id") or (name == "status") %> <% next %> <% end %> <p> diff --git a/app/views/tournaments/index.html.erb b/app/views/tournaments/index.html.erb index 452d939..d4ef414 100644 --- a/app/views/tournaments/index.html.erb +++ b/app/views/tournaments/index.html.erb @@ -21,7 +21,7 @@ <tbody> <% @tournaments.each do |tournament| %> <tr> - <td><%= tournament.game %></td> + <td><%= tournament.id %></td> <td><%= tournament.status %></td> <td><%= tournament.min_players_per_team %></td> <td><%= tournament.max_players_per_team %></td> |