diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-28 19:39:36 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-28 19:39:36 -0400 |
| commit | 87530c5bca7062ed18badf98bcb4b63529607ecd (patch) | |
| tree | 29f2da66af99fbf05726ae9f4fa4bd78d910a763 /app/controllers | |
| parent | 3a4412f08bed438ebf14f6cdfa5bb6eb4d239138 (diff) | |
| parent | 8dade78c49ad03085166c41d8b334a6ade3a287e (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/matches_controller.rb | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index bed06ba..5745ac9 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -45,18 +45,10 @@ class MatchesController < ApplicationController when 2 # Started, waiting to finish @match.handle_sampling(params) - if @match.finished? - @match.status = 3 - respond_to do |format| - if @match.save - format.html { redirect_to tournament_match_path(@tournament, @match), notice: 'Match has finished.' } - format.json { head :no_content } - else - format.html { render action: 'show' } - format.json { render json: @match.errors, status: :unprocessable_entity } - end - end - return + # The @match.status will be updated by Statistic's after_save hook + respond_to do |format| + format.html { redirect_to tournament_match_path(@tournament, @match), notice: 'Match has finished.' } + format.json { head :no_content } end when 3 if (@tournament.hosts.include? current_user) and (params[:update_action] == "start") |