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

1 files changed, 9 insertions, 2 deletions

diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb
index 7c93346..5bb9bf8 100644
--- a/app/controllers/tournaments_controller.rb
+++ b/app/controllers/tournaments_controller.rb
@@ -13,8 +13,10 @@ class TournamentsController < ApplicationController
   # GET /tournaments/1
   # GET /tournaments/1.json
   def show
-    unless @tournament.status
-      redirect_to tournament_matches_page(@tournament)
+    case @tournament.status
+    when 0
+    when 1..2
+      redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament)
     end
   end
 
@@ -27,6 +29,11 @@ class TournamentsController < ApplicationController
 
   # GET /tournaments/1/edit
   def edit
+    if params['close_action'] == 'close'
+      @tournament.status = 1
+      @tournament.save
+      redirect_to "/tournaments"
+    end
   end
 
   # POST /tournaments