diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-07 12:57:07 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-07 12:57:07 -0400 |
| commit | ca883abbaa80209df098292a138b7c2668f0e94e (patch) | |
| tree | 48e18e858969d93b6a1f0976587a47e7ea0900f0 /app/controllers/tournaments_controller.rb | |
| parent | 677f914b0d1c9cefcbd9aacbd48e83ab98916f8f (diff) | |
| parent | f11351569b922e7613259aa8968294536f7b41bd (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
app/controllers/matches_controller.rb
Diffstat (limited to 'app/controllers/tournaments_controller.rb')
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index 2fc82ed..f572248 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -14,8 +14,11 @@ class TournamentsController < ApplicationController case @tournament.status when 0 render action: 'show' - when 1..2 - redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" #tournament_matches_page(@tournament) + when 1 + #redirect_to tournament_matches_page(@tournament) + redirect_to "/tournaments/" + @tournament.id.to_s + "/matches" + when 2 + redirect_to tournaments_page end } format.json { |