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/controllers/tournaments_controller.rb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'app/controllers/tournaments_controller.rb')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 1d17205..915c072 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -15,8 +15,8 @@ class TournamentsController < ApplicationController
 
   # GET /tournaments/new
   def new
-    @game_names = Game.all.collect
-    @game = params[:game]
+    @games = Game.all
+    @game = Game.find_by_id(params[:game])
     @tournament = Tournament.new
   end
 
-- 
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/controllers/tournaments_controller.rb | 15 ++++++++++++++-
 1 file changed, 14 insertions(+), 1 deletion(-)

(limited to 'app/controllers/tournaments_controller.rb')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 915c072..5e79d7a 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -1,5 +1,5 @@
 class TournamentsController < ApplicationController
-  before_action :set_tournament, only: [:show, :edit, :update, :destroy]
+  before_action :set_tournament, only: [:show, :edit, :update, :destroy, :join]
   before_action :check_perms, only: [:new, :create, :edit, :update, :destroy]
 
   # GET /tournaments
@@ -64,6 +64,19 @@ class TournamentsController < ApplicationController
     end
   end
 
+  # POST /tournaments/1/join
+  # POST /tournaments/1/join.json
+  def join
+    respond_to do |format|
+      if @tournament.join(current_user)
+        format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
+        format.json { head :no_content }
+      end
+      format.html { render action: 'permission_denied', status: :forbidden }
+      format.json { render json: "Permission denied", status: :forbidden }
+    end
+  end
+
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_tournament
-- 
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/controllers/tournaments_controller.rb | 53 +++++++++++++++++++------------
 1 file changed, 33 insertions(+), 20 deletions(-)

(limited to 'app/controllers/tournaments_controller.rb')

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 8ed8cc9..6fc3ad6 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -1,6 +1,6 @@
 class TournamentsController < ApplicationController
   before_action :set_tournament, only: [:show, :edit, :update, :destroy, :join]
-  before_action :check_perms, only: [:new, :create, :edit, :update, :destroy]
+  before_action :check_perms, only: [:new, :create, :edit, :destroy]
 
   # GET /tournaments
   # GET /tournaments.json
@@ -42,13 +42,39 @@ class TournamentsController < ApplicationController
   # PATCH/PUT /tournaments/1
   # PATCH/PUT /tournaments/1.json
   def update
-    respond_to do |format|
-      if @tournament.update(tournament_params)
-        format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' }
-        format.json { head :no_content }
+    require 'pp'
+    pp params
+    if params[:update_action].nil?
+      check_perms
+      respond_to do |format|
+        if @tournament.update(tournament_params)
+          format.html { redirect_to @tournament, notice: 'Tournament was successfully updated.' }
+          format.json { head :no_content }
+        else
+          format.html { render action: 'edit' }
+          format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        end
+      end
+    else
+      case params[:update_action]
+      when "join"
+        respond_to do |format|
+          if @tournament.join(current_user)
+            format.html { render action: 'show', notice: 'You have joined this tournament.' }
+            format.json { head :no_content }
+          end
+          format.html { render action: 'permission_denied', status: :forbidden }
+          format.json { render json: "Permission denied", status: :forbidden }
+        end
+      #when "open"
+        # TODO
+      #when "close"
+        # TODO
       else
-        format.html { render action: 'edit' }
-        format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        respond_to do |format|
+          format.html { render action: 'show', notice: "Invalid action", status: :unprocessable_entity }
+          format.json { render json: @tournament.errors, status: :unprocessable_entity }
+        end
       end
     end
   end
@@ -63,19 +89,6 @@ class TournamentsController < ApplicationController
     end
   end
 
-  # POST /tournaments/1/join
-  # POST /tournaments/1/join.json
-  def join
-    respond_to do |format|
-      if @tournament.join(current_user)
-        format.html { redirect_to @tournament, notice: 'You have joined this tournament.' }
-        format.json { head :no_content }
-      end
-      format.html { render action: 'permission_denied', status: :forbidden }
-      format.json { render json: "Permission denied", status: :forbidden }
-    end
-  end
-
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_tournament
-- 
cgit v1.2.3-2-g168b