Merge branch 'master' of github.com:LukeShu/leaguer

Conflicts:
	config/routes.rb

1 files changed, 14 insertions, 4 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 27765df..74a1f56 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -11,12 +11,16 @@ class TournamentsController < ApplicationController
   # GET /tournaments/1
   # GET /tournaments/1.json
   def show
+    unless @tournament.status
+      redirect_to tournament_matches_page(@tournament)
+    end
   end
 
   # GET /tournaments/new
   def new
     @games = Game.all
     @tournament = Tournament.new(game: Game.find_by_id(params[:game]))
+    @tournament.status = 1
   end
 
   # GET /tournaments/1/edit
@@ -42,8 +46,7 @@ class TournamentsController < ApplicationController
   # PATCH/PUT /tournaments/1
   # PATCH/PUT /tournaments/1.json
   def update
-    require 'pp'
-    pp params
+  	
     if params[:update_action].nil?
       check_perms
       respond_to do |format|
@@ -66,8 +69,15 @@ class TournamentsController < ApplicationController
           format.html { render action: 'permission_denied', status: :forbidden }
           format.json { render json: "Permission denied", status: :forbidden }
         end
-      #when "open"
-        # TODO
+      when "open"
+        respond_to do |format|
+          if @tournament.setup
+            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 "close"
         # TODO
       else