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

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-12-31 01:24:20 +00:00
parent 617864eba8
commit 44b5970104
1 changed files with 18 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/wrestlers_controller.rb
View File

@@ -53,6 +53,9 @@ class WrestlersController < ApplicationController
# PATCH/PUT /wrestlers/1 # PATCH/PUT /wrestlers/1
# PATCH/PUT /wrestlers/1.json # PATCH/PUT /wrestlers/1.json
def update def update
@tournament = @wrestler.tournament
@weight = @wrestler.weight
@weights = @tournament.weights.sort_by{|w| w.max}
@school = @wrestler.school @school = @wrestler.school
respond_to do |format| respond_to do |format|
if @wrestler.update(wrestler_params) if @wrestler.update(wrestler_params)
@@ -79,26 +82,26 @@ class WrestlersController < ApplicationController
private private
# Use callbacks to share common setup or constraints between actions. # Use callbacks to share common setup or constraints between actions.
def set_wrestler def set_wrestler
@wrestler = Wrestler.where(:id => params[:id]).includes(:tournament,:school,:weight,:matches).first @wrestler = Wrestler.find(params[:id])
end end
# Never trust parameters from the scary internet, only allow the white list through. # Never trust parameters from the scary internet, only allow the white list through.
def wrestler_params def wrestler_params
params.require(:wrestler).permit(:name, :school_id, :weight_id, :seed, :original_seed, :season_win, :season_loss,:criteria,:extra,:offical_weight) params.require(:wrestler).permit(:name, :school_id, :weight_id, :seed, :original_seed, :season_win, :season_loss,:criteria,:extra,:offical_weight)
end end
def check_access def check_access
if params[:school] if params[:school]
@school = School.find(params[:school]) @school = School.find(params[:school])
@tournament = Tournament.find(@school.tournament.id) @tournament = Tournament.find(@school.tournament.id)
elsif params[:wrestler] elsif params[:wrestler]
@wrestler = Wrestler.new(wrestler_params) @wrestler = Wrestler.new(wrestler_params)
@school = School.find(@wrestler.school_id) @school = School.find(@wrestler.school_id)
@tournament = Tournament.find(@school.tournament.id) @tournament = Tournament.find(@school.tournament.id)
elsif @wrestler elsif @wrestler
@tournament = @wrestler.tournament @tournament = @wrestler.tournament
end end
if current_user != @tournament.user if current_user != @tournament.user
redirect_to '/static_pages/not_allowed' redirect_to '/static_pages/not_allowed'
end end
end end
end end