diff options
| author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 23:57:54 -0400 |
|---|---|---|
| committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-28 23:57:54 -0400 |
| commit | cd0c7d73be76feffbaaea9200c485b2316604469 (patch) | |
| tree | 9c708335a46b96c3a0c257a964f51fe88d023a0e /app/controllers/brackets_controller.rb | |
| parent | 7297cff5b674a61fd57ccc46eb75173011bd205c (diff) | |
| parent | 40c112d42922c14063759d381f834724f22a340d (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/brackets_controller.rb')
| -rw-r--r-- | app/controllers/brackets_controller.rb | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/app/controllers/brackets_controller.rb b/app/controllers/brackets_controller.rb index b91a2c4..e202c96 100644 --- a/app/controllers/brackets_controller.rb +++ b/app/controllers/brackets_controller.rb @@ -11,6 +11,7 @@ class BracketsController < ApplicationController # GET /brackets/1 # GET /brackets/1.json def show + @results = (@tournament.status == 4)? @bracket.calcResult : nil; @matches = @tournament.stages.order(:id).first.matches_ordered @numTeams = @tournament.min_teams_per_match @logBase = @numTeams |