diff options
author | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-26 20:35:55 -0400 |
---|---|---|
committer | guntasgrewal <guntasgrewal@gmail.com> | 2014-04-26 20:35:55 -0400 |
commit | 1d24cb050f198e9c8bec8dd014de203d889ab56a (patch) | |
tree | 9f10e7a5be75d7ffb4cb829d3738a144b5250b9b /app/views/brackets/show.html.erb | |
parent | 2d0fe1a4197e70cb99f4285a8b32a645914d8beb (diff) | |
parent | dfbbe46fdcca392b3dec703cf347d1b1d57ca94f (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/views/brackets/show.html.erb')
-rw-r--r-- | app/views/brackets/show.html.erb | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/app/views/brackets/show.html.erb b/app/views/brackets/show.html.erb index 9c7c14b..2e92bfb 100644 --- a/app/views/brackets/show.html.erb +++ b/app/views/brackets/show.html.erb @@ -1,13 +1,11 @@ -<p id="notice"><%= notice %></p> - <p> <strong>User:</strong> - <%= @bracket.user %> + <%= @bracket.user.user_name %> </p> <p> <strong>Tournament:</strong> - <%= @bracket.tournament %> + <%= @bracket.tournament.name %> </p> <p> @@ -15,5 +13,9 @@ <%= @bracket.name %> </p> -<%= link_to 'Edit', edit_bracket_path(@bracket) %> | -<%= link_to 'Back', brackets_path %> +<% @bracket.bracket_matches.each do |m| %> + <p><b><%= m.match.id %></b></p> +<% end %> + + +<%= link_to 'Back', tournaments_path %> |