diff options
author | tkimia <tkimia@purdue.edu> | 2014-04-07 12:55:14 -0400 |
---|---|---|
committer | tkimia <tkimia@purdue.edu> | 2014-04-07 12:55:14 -0400 |
commit | db15cd2c470d0929a3a74ee2c9b38741b2b6e524 (patch) | |
tree | c9c402389ed0ef7744f490922f51d5fe5a84dcca /app/controllers/tournaments_controller.rb | |
parent | aab1a6aa8384cdc10caab6a63d9e5b36537b6ad5 (diff) | |
parent | f11351569b922e7613259aa8968294536f7b41bd (diff) |
Merge branch 'master' of https://github.com/LukeShu/leaguer
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 { |