summaryrefslogtreecommitdiff
path: root/app/views
diff options
context:
space:
mode:
authorDavisLWebb <davislwebb@ymail.com>2014-04-24 12:28:50 -0400
committerDavisLWebb <davislwebb@ymail.com>2014-04-24 12:28:50 -0400
commit1cfcd314919b05237da659428500bc3680493d6c (patch)
tree61c2bef93e265ce9940f138b6f1925a63d109a50 /app/views
parent70762cf82eadda1e19e4c886604433aab0af0e94 (diff)
parent80352d2b8c9550929e3c25e9ae0b2517532648bf (diff)
Merge branch 'master' of https://github.com/LukeShu/Leaguer
Diffstat (limited to 'app/views')
-rw-r--r--app/views/matches/show.html.erb3
1 files changed, 2 insertions, 1 deletions
diff --git a/app/views/matches/show.html.erb b/app/views/matches/show.html.erb
index e9809a2..e1fe29e 100644
--- a/app/views/matches/show.html.erb
+++ b/app/views/matches/show.html.erb
@@ -47,7 +47,7 @@ function score_peers() {
<% if @match.status <= 1 %>
<li><%= user.user_name %></li>
<% else %>
- <li><%= user.user_name %> - SCORE: <%= @match.scores.select{|s| s.user == user}.first.value %></li>
+ <li><%= user.user_name %> - SCORE: <%= Statistic.where(:name => "score", :user => user, :match => @match).first.value %></li>
<% end %>
<% end %>
</ul></li>
@@ -75,6 +75,7 @@ function score_peers() {
<% end %>
<% when 1 %>
<!-- Started, waiting to finish -->
+ <!-- This will depend on the Sampling Method Eventually instead of always being Manual -->
<% if @tournament.hosts.include? current_user %>
<input type="hidden" name="update_action" value="finish">
<% @match.teams.each do |team| %>