From 96dd3fbe302eec54b34678e098d3b59710b09b5f Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sat, 26 Apr 2014 19:16:19 -0400
Subject: prelim bracket control

---
 app/views/brackets/new.html.erb | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

(limited to 'app/views/brackets')

diff --git a/app/views/brackets/new.html.erb b/app/views/brackets/new.html.erb
index c379c15..91d0033 100644
--- a/app/views/brackets/new.html.erb
+++ b/app/views/brackets/new.html.erb
@@ -1,5 +1,3 @@
 <h1>New bracket</h1>
 
-<%= render 'form' %>
-
-<%= link_to 'Back', brackets_path %>
+<%= link_to 'Back', tournament_brackets_path %>
-- 
cgit v1.2.3-2-g168b


From 93e291c8e5002fdea906bb8c96cd528fa8b75935 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sat, 26 Apr 2014 19:39:57 -0400
Subject: brackets just get created

---
 app/views/brackets/index.html.erb | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

(limited to 'app/views/brackets')

diff --git a/app/views/brackets/index.html.erb b/app/views/brackets/index.html.erb
index 2195d69..9effe37 100644
--- a/app/views/brackets/index.html.erb
+++ b/app/views/brackets/index.html.erb
@@ -8,7 +8,6 @@
       <th>Name</th>
       <th></th>
       <th></th>
-      <th></th>
     </tr>
   </thead>
 
@@ -18,9 +17,8 @@
         <td><%= bracket.user %></td>
         <td><%= bracket.tournament %></td>
         <td><%= bracket.name %></td>
-        <td><%= link_to 'Show', bracket %></td>
-        <td><%= link_to 'Edit', edit_bracket_path(bracket) %></td>
-        <td><%= link_to 'Destroy', bracket, method: :delete, data: { confirm: 'Are you sure?' } %></td>
+        <td><%= link_to 'Show', tournament_bracket_path(@tournament, bracket) %></td>
+        <td><%= link_to 'Edit', edit_tournament_bracket_path(@tournament, bracket) %></td>
       </tr>
     <% end %>
   </tbody>
@@ -28,4 +26,3 @@
 
 <br>
 
-<%= link_to 'New Bracket', new_bracket_path %>
-- 
cgit v1.2.3-2-g168b


From e60adb874faffd9bac678a19043532ff33dc6b07 Mon Sep 17 00:00:00 2001
From: tkimia <tkimia@purdue.edu>
Date: Sat, 26 Apr 2014 20:14:00 -0400
Subject: bracket creation is good

---
 app/views/brackets/show.html.erb | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

(limited to 'app/views/brackets')

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 %>
-- 
cgit v1.2.3-2-g168b