cody/wrestlingdev.com
1
0
Fork 0
mirror of https://github.com/jcwimer/wrestlingApp synced 2026-04-02 21:24:25 +00:00
Code Issues Releases Wiki Activity

Added all matches page and edit matches page

Browse Source
This commit is contained in:
Jacob Cody Wimer
2015-12-31 20:07:14 +00:00
parent f3936b0906
commit 633c762b2e
8 changed files with 264 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/controllers/matches_controller.rb
View File

@@ -16,6 +16,8 @@ class MatchesController < ApplicationController
if @match
@w1 = @match.wrestler1
@w2 = @match.wrestler2
@wrestlers = [@w1,@w2]
@tournament = @match.tournament
end
end
@@ -43,7 +45,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, :g_stat, :r_stat, :winner_id, :win_type, :score, :finished)
params.require(:match).permit(:w1, :w2, :w1_stat, :w2_stat, :winner_id, :win_type, :score, :finished)
end
def check_access

13
app/controllers/tournaments_controller.rb
View File

@@ -1,8 +1,17 @@
class TournamentsController < ApplicationController
before_action :set_tournament, only: [:weigh_in,:weigh_in_weight,:create_custom_weights,:show,:edit,:update,:destroy,:up_matches,:no_matches,:team_scores,:brackets,:generate_matches,:bracket,:all_brackets]
before_filter :check_access, only: [:weigh_in,:weigh_in_weight,:create_custom_weights,:update,:edit,:destroy,:generate_matches]
before_action :set_tournament, only: [:matches,:weigh_in,:weigh_in_weight,:create_custom_weights,:show,:edit,:update,:destroy,:up_matches,:no_matches,:team_scores,:brackets,:generate_matches,:bracket,:all_brackets]
before_filter :check_access, only: [:weigh_in,:weigh_in_weight,:create_custom_weights,:update,:edit,:destroy,:generate_matches,:matches]
before_filter :check_for_matches, only: [:up_matches,:bracket,:all_brackets]
def matches
@matches = @tournament.matches.sort_by{|m| m.bout_number}
if @match
@w1 = @match.wrestler1
@w2 = @match.wrestler2
@wrestlers = [@w1,@w2]
end
end
def weigh_in_weight
if params[:wrestler]
Wrestler.update(params[:wrestler].keys, params[:wrestler].values)