diff options
author | nfoy <nfoy@purdue.edu> | 2014-03-06 21:15:12 -0500 |
---|---|---|
committer | nfoy <nfoy@purdue.edu> | 2014-03-06 21:15:12 -0500 |
commit | e4fe0192a332a324dd207b370252669c88216488 (patch) | |
tree | 463d5e1f42d50417c605fd393a2b6b2b33601c9f /app/controllers | |
parent | a892016443d4845c1f738bcc57db82174c53701c (diff) |
matches now belong to tournament
Diffstat (limited to 'app/controllers')
-rw-r--r-- | app/controllers/matches_controller.rb | 17 |
1 files changed, 10 insertions, 7 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 2d8ea5e..23d2700 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -1,6 +1,6 @@ class MatchesController < ApplicationController - before_action :set_match #, only: [:show, :edit, :update, :destroy] - + before_action :set_tournament, only: [:index] + before_action :set_match, only: [:show, :edit, :update, :destroy] # GET /matches # GET /matches.json def index @@ -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,10 +54,10 @@ 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 @@ -65,8 +65,11 @@ class MatchesController < ApplicationController # Use callbacks to share common setup or constraints between actions. def set_match @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) |