diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-24 19:03:41 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-24 19:03:41 -0400 |
| commit | 1b11684986136ee87da6242c3ba6aba5ef581510 (patch) | |
| tree | d7ec999baced4836a9b3b7b31eee39cfe09410c9 /app/controllers | |
| parent | 9823642115ef52f0a21b9466cef412098a124f3d (diff) | |
| parent | db073045ff7cf5d8a2fb4a3349ed6a9a6ac019d3 (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers')
| -rw-r--r-- | app/controllers/matches_controller.rb | 4 | ||||
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/matches_controller.rb b/app/controllers/matches_controller.rb index 1ad86d0..138cf28 100644 --- a/app/controllers/matches_controller.rb +++ b/app/controllers/matches_controller.rb @@ -23,8 +23,8 @@ class MatchesController < ApplicationController @match.teams.each do |team| team.users.each do |user| - players_id.push(user.remote_usernames[0]["json_value"]["id"]) - players.push(user.remote_usernames[0]["json_value"]["id"]) + players_id.push(user.remote_usernames[0].value["id"]) + players.push(user.remote_usernames[0].value["name"]) end end diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index ebc54c1..1354ad6 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -116,8 +116,8 @@ class TournamentsController < ApplicationController success = true ActiveRecord::Base.transaction do success &= @tournament.save && - success &= @tournament.tournament_stages.create(scheduling: "elimination") - success &= @tournament.tournament_stages.first.create_matches + success &= @tournament.stages.create(scheduling: "elimination") + success &= @tournament.stages.first.create_matches end if success format.html { redirect_to @tournament, notice: 'You have started this tournament.' } |