From 1788dde36e53c4ef16adc5db2d19f44797325496 Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 6 Mar 2014 18:55:38 -0500
Subject: implement tournament joining

---
 app/views/tournaments/show.html.erb | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'app/views/tournaments/show.html.erb')

diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 0d9dd10..1470d80 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,3 +1,9 @@
+<% if @tournament.joinable_by?(current_user) %>
+	<%= form_tag(tournament_page(@tournament)+"/join", method: "get") do %>
+		<%= submit_tag("Join") %>
+	<% end %>
+<% end %>
+
 <p>
   <strong>Game:</strong>
   <%= @tournament.game %>
-- 
cgit v1.2.3-2-g168b


From 7bcd854443e368806cf1f4ece562c157db723d1a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 6 Mar 2014 20:37:53 -0500
Subject: fix joining a tournament

---
 app/views/tournaments/show.html.erb | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'app/views/tournaments/show.html.erb')

diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb
index 85ed026..91c1961 100644
--- a/app/views/tournaments/show.html.erb
+++ b/app/views/tournaments/show.html.erb
@@ -1,5 +1,6 @@
 <% if @tournament.joinable_by?(current_user) %>
-	<%= form_tag(tournament_page(@tournament)+"/join", method: "get") do %>
+	<%= form_tag(tournament_path(@tournament), method: "put") do %>
+		<input type="hidden" name="update_action" value="join">
 		<%= submit_tag("Join") %>
 	<% end %>
 <% end %>
-- 
cgit v1.2.3-2-g168b