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

Revert "Eager load users and delegates for tournaments, eager load delegates and tournament for schools"

Browse Source 
This reverts commit 911faceb7c.

Permissions to edit a wrestler are not working in production.
This commit is contained in:
Jacob Cody Wimer
2016-01-22 13:21:13 +00:00
parent 285cfa9647
commit e48d473807
6 changed files with 16 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/matches_controller.rb
View File

@@ -49,6 +49,6 @@ class MatchesController < ApplicationController
end
def check_access
authorize! :manage, Tournament.where(:id => @match.tournament.id).includes(:delegates,:user).first
authorize! :manage, @match.tournament
end
end

6
app/controllers/mats_controller.rb
View File

@@ -82,12 +82,12 @@ class MatsController < ApplicationController
def check_access
if params[:tournament]
@tournament = Tournament.where(:id => params[:tournament]).includes(:delegates,:user).first
@tournament = Tournament.find(params[:tournament])
elsif params[:mat]
@mat = Mat.new(mat_params)
@tournament = Tournament.where(:id => @mat.tournament_id).includes(:delegates,:user).first
@tournament = Tournament.find(@mat.tournament_id)
elsif @mat
@tournament = Tournament.where(:id => @mat.tournament.id).includes(:delegates,:user).first
@tournament = @mat.tournament
end
authorize! :manage, @tournament
end

8
app/controllers/schools_controller.rb
View File

@@ -79,13 +79,13 @@ class SchoolsController < ApplicationController
def check_access_director
if params[:tournament]
@tournament = Tournament.where(:id => params[:tournament]).includes(:delegates,:user).first
@tournament = Tournament.find(params[:tournament])
elsif params[:school]
@tournament = Tournament.where(:id => params[:school]["tournament_id"]).includes(:delegates,:user).first
@tournament = Tournament.find(params[:school]["tournament_id"])
elsif @school
@tournament = Tournament.where(:id => @school.tournament.id).includes(:delegates,:user).first
@tournament = @school.tournament
elsif school_params
@tournament = Tournament.where(:id => school_params[:tournament_id]).includes(:delegates,:user).first
@tournament = Tournament.find(school_params[:tournament_id])
end
authorize! :manage, @tournament
end

2
app/controllers/tournaments_controller.rb
View File

@@ -241,7 +241,7 @@ class TournamentsController < ApplicationController
private
# Use callbacks to share common setup or constraints between actions.
def set_tournament
@tournament = Tournament.where(:id => params[:id]).includes(:schools,:weights,:mats,:matches,:user,:wrestlers,:delegates).first
@tournament = Tournament.where(:id => params[:id]).includes(:schools,:weights,:mats,:matches,:user,:wrestlers).first
end
# Never trust parameters from the scary internet, only allow the white list through.

6
app/controllers/weights_controller.rb
View File

@@ -82,11 +82,11 @@ class WeightsController < ApplicationController
end
def check_access
if params[:tournament]
@tournament = Tournament.where(:id => params[:tournament]).includes(:delegates,:user).first
@tournament = Tournament.find(params[:tournament])
elsif params[:weight]
@tournament = Tournament.where(:id => params[:weight]["tournament_id"]).includes(:delegates,:user).first
@tournament = Tournament.find(params[:weight]["tournament_id"])
elsif @weight
@tournament = Tournament.where(:id => @weight.tournament.id).includes(:delegates,:user).first
@tournament = @weight.tournament
end
authorize! :manage, @tournament
end

8
app/controllers/wrestlers_controller.rb
View File

@@ -91,16 +91,16 @@ class WrestlersController < ApplicationController
end
def check_access
if params[:school]
@school = School.where(:id => params[:school]).includes(:delegates,:tournament).first
@school = School.find(params[:school])
#@tournament = Tournament.find(@school.tournament.id)
elsif params[:wrestler]
@school = School.where(:id => params[:wrestler]["school_id"]).includes(:delegates,:tournament).first
@school = School.find(params[:wrestler]["school_id"])
#@tournament = Tournament.find(@school.tournament.id)
elsif @wrestler
@school = School.where(:id => @wrestler.school.tournament.id).includes(:delegates,:tournament).first
@school = @wrestler.school
#@tournament = @wrestler.tournament
elsif wrestler_params
@school = School.where(:id => wrestler_params[:school_id]).includes(:delegates,:tournament).first
@school = School.find(wrestler_params[:school_id])
end
authorize! :manage, @school
end