diff options
| author | tkimia <tkimia@purdue.edu> | 2014-04-28 20:30:40 -0400 |
|---|---|---|
| committer | tkimia <tkimia@purdue.edu> | 2014-04-28 20:30:40 -0400 |
| commit | 1c5930a82f80abff26556e85c71834af9803bc7c (patch) | |
| tree | b64eea71b7eeec4b9f59cbd9a64c50cb78367790 /app | |
| parent | 25ff0e9d1a22cbfa65fbece800d00d7cae0c0d8e (diff) | |
bracket changes to status 2
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/brackets_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/common/_show_tournament.html.erb | 2 |
2 files changed, 3 insertions, 3 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 %> |