diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-28 21:32:09 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-28 21:32:09 -0400 |
| commit | d52ceaf8d2b823b68edcf3614999b8639a0971f9 (patch) | |
| tree | bdb969dbad788cb7e63665bf502c754765286db6 /app | |
| parent | 819fd70c1285bf5670b68842adad8c77c36d1076 (diff) | |
| parent | 7410df080be95211daa2e97b8a57faa8aa903b0a (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app')
| -rw-r--r-- | app/models/match.rb | 4 | ||||
| -rw-r--r-- | app/views/matches/show.html.erb | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/app/models/match.rb b/app/models/match.rb index 57b7d36..85084f5 100644 --- a/app/models/match.rb +++ b/app/models/match.rb @@ -7,8 +7,8 @@ class Match < ActiveRecord::Base def finished? ok = true - tournament_stage.scoring_method.stats_needed.each do |stat| - ok &= statistics.where(match: self, name: stat).nil? + tournament_stage.scoring.stats_needed.each do |stat| + ok &= !statistics.where(match: self, name: stat).nil? end ok end diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb index 01484d3..bf5518f 100644 --- a/app/views/matches/show.html.erb +++ b/app/views/matches/show.html.erb @@ -5,7 +5,7 @@ </p> <p> <strong>Tournament stage:</strong> - <%= @match.tournament_stage %> + <%= @tournament.stages.order(:id).index(@match.tournament_stage)+1 %> </p> <%# |