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

Conflicts:
	config/routes.rb

2 files changed, 26 insertions, 13 deletions

diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index 984be3f..23d2700 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -1,10 +1,10 @@
 class MatchesController < ApplicationController
+  before_action :set_tournament, only: [:index]
   before_action :set_match, only: [:show, :edit, :update, :destroy]
-
   # GET /matches
   # GET /matches.json
   def index
-    @matches = Match.all
+    @matches = @tournament.matches
   end
 
   # GET /matches/1
@@ -14,7 +14,7 @@ class MatchesController < ApplicationController
 
   # GET /matches/new
   def new
-    @match = Match.new
+
   end
 
   # GET /matches/1/edit
@@ -24,11 +24,11 @@ class MatchesController < ApplicationController
   # POST /matches
   # POST /matches.json
   def create
-    @match = Match.new(match_params)
+    @match = @tournament.matches.build(match_params)
 
     respond_to do |format|
       if @match.save
-        format.html { redirect_to @match, notice: 'Match was successfully created.' }
+        format.html { redirect_to tournament_matches_path, notice: 'Match was successfully created.' }
         format.json { render action: 'show', status: :created, location: @match }
       else
         format.html { render action: 'new' }
@@ -54,19 +54,22 @@ class MatchesController < ApplicationController
   # DELETE /matches/1
   # DELETE /matches/1.json
   def destroy
+    
     @match.destroy
     respond_to do |format|
-      format.html { redirect_to matches_url }
-      format.json { head :no_content }
+      format.html { redirect_to tournament_matches_path }
     end
   end
 
   private
     # Use callbacks to share common setup or constraints between actions.
     def set_match
-      @match = Match.find(params[:id])
+      @tournament = Tournament.find(params[:tournament_id])
+      @match = @tournament.matches.find(params[:id]);
+    end
+    def set_tournament
+      @tournament = Tournament.find(params[:tournament_id])
     end
-
     # Never trust parameters from the scary internet, only allow the white list through.
     def match_params
       params.require(:match).permit(:tournament_id, :name)
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