diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-26 20:25:29 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-26 20:25:29 -0400 |
| commit | a5a08c542e550c20493d746546a886efe2123434 (patch) | |
| tree | 506e00c350b51016222140d9f917883bf76cb59b /app/views/brackets/show.html.erb | |
| parent | 7d97ad8ff641c1f5d67706bec053c77ece70b18a (diff) | |
| parent | 853c307700fa81b924e00bf430c878a3b7029ffe (diff) | |
Merge branch 'master' of http://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 %> |