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 check_access bug

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-12-31 01:56:10 +00:00
parent 44b5970104
commit c9ff63548b
4 changed files with 6 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/matches_controller.rb
View File

@@ -47,8 +47,8 @@ class MatchesController < ApplicationController
end
def check_access
if current_user != @match.tournament.user
redirect_to '/static_pages/not_allowed'
if current_user != @match.tournament.user
redirect_to '/static_pages/not_allowed'
end
end
end

3
app/controllers/schools_controller.rb
View File

@@ -80,8 +80,7 @@ class SchoolsController < ApplicationController
if params[:tournament]
@tournament = Tournament.find(params[:tournament])
elsif params[:school]
@school = School.new(school_params)
@tournament = Tournament.find(@school.tournament_id)
@tournament = Tournament.find(params[:school]["tournament_id"])
elsif @school
@tournament = @school.tournament
end

3
app/controllers/weights_controller.rb
View File

@@ -87,8 +87,7 @@ class WeightsController < ApplicationController
if params[:tournament]
@tournament = Tournament.find(params[:tournament])
elsif params[:weight]
@weight = Weight.new(weight_params)
@tournament = Tournament.find(@weight.tournament_id)
@tournament = Tournament.find(params[:weight]["tournament_id"])
elsif @weight
@tournament = @weight.tournament
end

5
app/controllers/wrestlers_controller.rb
View File

@@ -82,7 +82,7 @@ class WrestlersController < ApplicationController
private
# Use callbacks to share common setup or constraints between actions.
def set_wrestler
@wrestler = Wrestler.find(params[:id])
@wrestler = Wrestler.where(:id => params[:id]).includes(:school, :weight, :tournament, :matches).first
end
# Never trust parameters from the scary internet, only allow the white list through.
@@ -94,8 +94,7 @@ class WrestlersController < ApplicationController
@school = School.find(params[:school])
@tournament = Tournament.find(@school.tournament.id)
elsif params[:wrestler]
@wrestler = Wrestler.new(wrestler_params)
@school = School.find(@wrestler.school_id)
@school = School.find(params[:wrestler]["school_id"])
@tournament = Tournament.find(@school.tournament.id)
elsif @wrestler
@tournament = @wrestler.tournament