cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-03-25 01:14:43 +00:00
Code Issues Releases Wiki Activity

Fixed redirect for match editing and added controller tests. Added wrestler school name to match edit form. Added authorization tests to all matches page.

Browse Source
This commit is contained in:
Jacob Cody Wimer
2019-01-23 19:22:55 +00:00
parent bb8ec92bf0
commit b001445090
9 changed files with 52 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/controllers/matches_controller.rb
View File

@@ -19,6 +19,7 @@ class MatchesController < ApplicationController
@wrestlers = [@w1,@w2]
@tournament = @match.tournament
end
session[:return_path] = "/tournaments/#{@tournament.id}/matches"
end
@@ -27,8 +28,8 @@ class MatchesController < ApplicationController
def update
respond_to do |format|
if @match.update(match_params)
if params[:match][:redirect_path]
format.html { redirect_to params[:match][:redirect_path], notice: 'Match was successfully updated.' }
if session[:return_path]
format.html { redirect_to session.delete(:return_path), notice: 'Match was successfully updated.' }
else
format.html { redirect_to "/tournaments/#{@match.tournament.id}", notice: 'Match was successfully updated.' }
end
@@ -49,7 +50,7 @@ class MatchesController < ApplicationController
# Never trust parameters from the scary internet, only allow the white list through.
def match_params
params.require(:match).permit(:w1, :w2, :w1_stat, :w2_stat, :winner_id, :win_type, :score, :finished, :redirect_path)
params.require(:match).permit(:w1, :w2, :w1_stat, :w2_stat, :winner_id, :win_type, :score, :finished)
end
def check_access