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

Allow nil when modifiying match wrestlers, allow nil when stating a match, fixed tournament navbar on wrestler edit, fixed tournament navbar on edit match wrestlers

Browse Source
This commit is contained in:
Jacob Cody Wimer
2022-01-24 21:54:50 +00:00
parent 7220ffe3c6
commit 58d088907a
7 changed files with 52 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
app/controllers/matches_controller.rb
View File

@@ -16,6 +16,7 @@ class MatchesController < ApplicationController
end
if @match
@wrestlers = @match.weight.wrestlers
@tournament = @match.tournament
end
session[:return_path] = "/tournaments/#{@match.tournament.id}/matches"
end
@@ -24,10 +25,36 @@ class MatchesController < ApplicationController
if params[:match]
@match = Match.where(:id => params[:match]).includes(:wrestlers).first
end
@wrestlers = []
if @match
@w1 = @match.wrestler1
@w2 = @match.wrestler2
@wrestlers = [@w1,@w2]
if @match.w1
@wrestler1_name = @match.wrestler1.name
@wrestler1_school_name = @match.wrestler1.school.name
if @match.wrestler1.last_match
@wrestler1_last_match = time_ago_in_words(@match.wrestler1.last_match.updated_at)
else
@wrestler1_last_match = "N/A"
end
@wrestlers.push(@match.wrestler1)
else
@wrestler1_name = "Not assigned"
@wrestler1_school_name = "N/A"
@wrestler1_last_match = "N/A"
end
if @match.w2
@wrestler2_name = @match.wrestler2.name
@wrestler2_school_name = @match.wrestler2.school.name
if @match.wrestler2.last_match
@wrestler2_last_match = time_ago_in_words(@match.wrestler2.last_match.updated_at)
else
@wrestler1_last_match = "N/A"
end
@wrestlers.push(@match.wrestler2)
else
@wrestler2_name = "Not assigned"
@wrestler2_school_name = "N/A"
@wrestler2_last_match = "N/A"
end
@tournament = @match.tournament
end
session[:return_path] = "/tournaments/#{@tournament.id}/matches"