diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-28 19:57:02 -0400 |
| commit | 3ab30900798a838b399d06f28251b6cdd82a94de (patch) | |
| tree | b0e5ba4dee18ad9fc0902a1969fdaf9e9306d1f9 /app/controllers | |
| parent | d5d480bc0a98eb3532ce0a6567585b791e44db07 (diff) | |
| parent | a81ca51690e81444ecb87435ef29195b1e017f68 (diff) | |
Fixed the db/seeds merge conflict
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/matches_controller.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 5745ac9..81ffcd8 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -44,7 +44,7 @@ class MatchesController < ApplicationController end when 2 # Started, waiting to finish - @match.handle_sampling(params) + @match.handle_sampling(@current_user, params) # 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.' } @@ -69,8 +69,9 @@ class MatchesController < ApplicationController end return end + else + redirect_to tournament_match_path(@tournament, @match) end - redirect_to tournament_match_path(@tournament, @match) end private |