From 1178dea355bf88213f5b36fae8914af6385b341a Mon Sep 17 00:00:00 2001
From: Luke Shumaker <LukeShu@sbcglobal.net>
Date: Thu, 6 Mar 2014 15:06:19 -0500
Subject: tournaments: fix game selection

---
 app/views/tournaments/new.html.erb | 17 +++++++----------
 1 file changed, 7 insertions(+), 10 deletions(-)

(limited to 'app/views')

diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index 428487a..6c3fefc 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -1,19 +1,16 @@
-<%= javascript_include_tag :defaults %>
-
 <h1>New Tournament</h1>
 
-<%= select_tag 'tournament_id', options_for_select(["Select a Game Type"] + Game.all.collect {|game| game.name}), :onchange => 'populate()' %> <%= link_to 'Select', 'new?game=1', :class => "btn btn-warning btn-lg" %>
-
+<%= form_tag(new_tournament_path, method: "get") do %>
+	<%= select_tag('game',
+	               options_from_collection_for_select(@games, 'id', 'name', @game.nil? || @game.id),
+	               :prompt => "Select a Game Type") %>
+	<%= submit_tag("Select", :class => "btn-warning btn-lg") %>
+<% end %>
 
-
-<br />
 <div id='ajax-form'>
-	<% if not @game.nil? %>
+	<% unless @game.nil? %>
 		<%= render 'selected' %>
 	<% end %>
 </div>
-<br /><br />
-
-<%= link_to 'Select', 'selected', :class => "btn btn-warning btn-lg" %>
 
 <%= link_to 'Back', tournaments_path %>
-- 
cgit v1.2.3-2-g168b


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/_selected.html.erb | 32 ++++++++------------------------
 app/views/tournaments/new.html.erb       |  4 ++--
 app/views/tournaments/show.html.erb      |  6 ++++++
 3 files changed, 16 insertions(+), 26 deletions(-)

(limited to 'app/views')

diff --git a/app/views/tournaments/_selected.html.erb b/app/views/tournaments/_selected.html.erb
index 4277d8e..551dc40 100644
--- a/app/views/tournaments/_selected.html.erb
+++ b/app/views/tournaments/_selected.html.erb
@@ -1,31 +1,15 @@
 <%= form_for(@tournament) do |f| %>
-  <% if @tournament.errors.any? %>
-    <div id="error_explanation">
-      <h2><%= pluralize(@tournament.errors.count, "error") %> prohibited this tournament from being saved:</h2>
+  <%= render "common/error_messages", :target => @tournament %>
+  <%= f.hidden_field(:game_id) %>
 
-      <ul>
-      <% @tournament.errors.full_messages.each do |msg| %>
-        <li><%= msg %></li>
-      <% end %>
-      </ul>
-    </div>
-  <% end %>
-
-  <%# this is the dynamic script to output fields to the form %>
-  <% @chosen = Game.find(@game) %>
-  <% @chosen.attributes.each do |name, value| %>
-    <% if name == "id" %>
+  <% @tournament.attributes.each do |name, value| %>
+    <% if (name == "id") or (name =~ /.*_at$/) %>
       <% next %>
     <% end %>
-    <% if name == "created_at" %>
-      <% break %>
-    <% end %>
-  <p>
-    <label for=<%= name %>><%= name.capitalize.gsub('_', ' ') %></label>
-    <br />
-    <input type="text" id=<%= name %> value=<%= value %>>
-  </p>
+    <p>
+      <%= f.label name %><br>
+      <%= f.text_field name %>
+    </p>
   <% end %>
-
   <%= f.submit %>
 <% end %>
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb
index 6c3fefc..e007e31 100644
--- a/app/views/tournaments/new.html.erb
+++ b/app/views/tournaments/new.html.erb
@@ -2,13 +2,13 @@
 
 <%= form_tag(new_tournament_path, method: "get") do %>
 	<%= select_tag('game',
-	               options_from_collection_for_select(@games, 'id', 'name', @game.nil? || @game.id),
+	               options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id),
 	               :prompt => "Select a Game Type") %>
 	<%= submit_tag("Select", :class => "btn-warning btn-lg") %>
 <% end %>
 
 <div id='ajax-form'>
-	<% unless @game.nil? %>
+	<% unless @tournament.game.nil? %>
 		<%= render 'selected' %>
 	<% end %>
 </div>
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')

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