diff options
| author | DavisLWebb <davislwebb@ymail.com> | 2014-04-24 12:28:50 -0400 |
|---|---|---|
| committer | DavisLWebb <davislwebb@ymail.com> | 2014-04-24 12:28:50 -0400 |
| commit | 1cfcd314919b05237da659428500bc3680493d6c (patch) | |
| tree | 61c2bef93e265ce9940f138b6f1925a63d109a50 /app/controllers/matches_controller.rb | |
| parent | 70762cf82eadda1e19e4c886604433aab0af0e94 (diff) | |
| parent | 80352d2b8c9550929e3c25e9ae0b2517532648bf (diff) | |
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Diffstat (limited to 'app/controllers/matches_controller.rb')
| -rw-r--r-- | app/controllers/matches_controller.rb | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 8a8b9ca..1604564 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -150,10 +150,10 @@ class MatchesController < ApplicationController # Individual scores scores = params["scores"] scores.each do |user_name, score| - Score.create(user: User.find_by_user_name(user_name), match: @match, value: score.to_i) + Statistic.create(user: User.find_by_user_name(user_name), match: @match, name: "score", value: score.to_i) end - # Team scores + # Team scores (processing for manual) team_scores = {} @match.teams.each do |team| team_scores[team] = 0 @@ -165,10 +165,10 @@ class MatchesController < ApplicationController @match.winner = teams[teams.keys.sort.last] # Schedule next match - cur_match_num = @tournament.matches_ordered.invert[@match] - unless cur_match_num == 1 - @match.winner.matches.push(@tournament.matches_ordered[cur_match_num/2]) - end + #cur_match_num = @tournament.matches_ordered.invert[@match] + #unless cur_match_num == 1 + # @match.winner.matches.push(@tournament.matches_ordered[cur_match_num/2]) + #end # Skip peer evaluation if there aren't enough players per team peer = false @@ -249,7 +249,7 @@ class MatchesController < ApplicationController # Never trust parameters from the scary internet, only allow the white list through. def match_params - params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations) + params.require(:match).permit(:status, :tournament_stage_id, :winner_id, :remote_id, :submitted_peer_evaluations, :update_action) end # Turn of check_edit, since our #update is flexible |