diff options
| author | nfoy <nfoy@purdue.edu> | 2014-04-28 20:39:47 -0400 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-04-28 20:39:47 -0400 |
| commit | 82c6b59f4afeba005ef2dc47483873c85fa33ffd (patch) | |
| tree | 746c9ca12941a21fc42af802924967d1ff0b6a0d | |
| parent | d2c700eb31e6a81cb5befe2f9dc57afa7fe8dc91 (diff) | |
| parent | 1c5930a82f80abff26556e85c71834af9803bc7c (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
| -rw-r--r-- | app/controllers/brackets_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/common/_show_tournament.html.erb | 2 | ||||
| -rw-r--r-- | db/seeds.rb | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/app/controllers/brackets_controller.rb b/app/controllers/brackets_controller.rb index 50ff5fe..ac34bfe 100644 --- a/app/controllers/brackets_controller.rb +++ b/app/controllers/brackets_controller.rb @@ -37,7 +37,7 @@ class BracketsController < ApplicationController @bracket.name = current_user.user_name + "'s Prediction for " + @tournament.name respond_to do |format| - if @tournament.status == 1 && @tournament.stages.first.scheduling_method == "elimination" && @tournament.stages.first.matches.first.status == 0 + if @tournament.status == 1 && @tournament.stages.first.scheduling_method == "elimination" && @tournament.stages.first.matches.first.status < 2 @bracket.save @bracket.create_matches format.html { redirect_to @bracket, notice: 'Bracket was successfully created.' } @@ -54,7 +54,7 @@ class BracketsController < ApplicationController def update respond_to do |format| if @bracket.update(bracket_params) - format.html { redirect_to @bracket, notice: 'Bracket was successfully updated.' } + format.html { redirect_to @tournament, notice: 'Bracket was successfully updated.' } format.json { head :no_content } else format.html { render action: 'edit' } diff --git a/app/views/common/_show_tournament.html.erb b/app/views/common/_show_tournament.html.erb index 826eeaa..02852cf 100644 --- a/app/views/common/_show_tournament.html.erb +++ b/app/views/common/_show_tournament.html.erb @@ -33,7 +33,7 @@ <% elsif target.players.include?(current_user)%> <p class="message">You've signed up for this tournament!</p> <% end %> - <% if target.status == 1 && target.stages.first.scheduling_method == "elimination" && target.stages.first.matches.first.status == 0 %> + <% if target.status == 1 && target.stages.order(:id).first.scheduling_method == "elimination" && target.stages.order(:id).first.matches.order(:id).first.status < 2 %> <%= form_tag(tournament_brackets_path(target), method: "post") do %> <%= submit_tag("Make Bracket") %> <% end %> diff --git a/db/seeds.rb b/db/seeds.rb index 4886325..014d94a 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -123,7 +123,7 @@ if Rails.env.development? players_for_league.each do |player| tourn5.join(player) end - tourn5.stages.create(scheduling_method: "round_robin" , seeding_method: "random_seeding") + tourn5.stages.create(scheduling_method: "elimination" , seeding_method: "random_seeding") # Yet another League tournament tourn6 = Tournament.create(game_id: 1, name: "3 teams per match", |