summaryrefslogtreecommitdiff
path: root/app/controllers/matches_controller.rb
diff options
context:
space:
mode:
authorAndrewMurrell <amurrel@purdue.edu>2014-04-07 03:35:49 -0400
committerAndrewMurrell <amurrel@purdue.edu>2014-04-07 03:35:49 -0400
commitfea1311388477583b31fa3214a7241a7322f494a (patch)
tree2c62a02a89b220266e8c511dcf2a494779147e3e /app/controllers/matches_controller.rb
parent22d74ce5b34140b353d43a1848fe51eaaa254d84 (diff)
Updated Generate and Re-added hoooks
Diffstat (limited to 'app/controllers/matches_controller.rb')
-rw-r--r--app/controllers/matches_controller.rb11
1 files changed, 6 insertions, 5 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb
index fc44e35..9c0a740 100644
--- a/app/controllers/matches_controller.rb
+++ b/app/controllers/matches_controller.rb
@@ -147,11 +147,12 @@ class MatchesController < ApplicationController
if (@match.status == 1)
@scores = @match.scores
end
- file_blue = "blue.yaml"
- file_purple = "purple.yaml"
- @blue2 = YAML.load_file(file_blue)
- @purp2 = YAML.load_file(file_purple)
-
+ if Tournament.find_by_id(@match.tournament_id).game_id == 1
+ file_blue = "blue.yaml"
+ file_purple = "purple.yaml"
+ @blue2 = YAML.load_file(file_blue)
+ @purp2 = YAML.load_file(file_purple)
+ end
end
def update