diff options
author | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
---|---|---|
committer | Luke Shumaker <shumakl@purdue.edu> | 2014-04-04 20:44:43 -0400 |
commit | 38d6960be1efdb6345445ab293a8cd605193785f (patch) | |
tree | df37e79b5744b570aded5aa4d7fe38cd772a49fe /app/views/tournaments/show.html.erb | |
parent | bcfa571b0328a4b3e94479a31c027621ceb86ad5 (diff) | |
parent | d14dcf9af11a0f2eab2609efb7d9e59a9cc18bb0 (diff) |
Merge branch 'master' into luke
Conflicts:
app/controllers/application_controller.rb
app/controllers/tournaments_controller.rb
Diffstat (limited to 'app/views/tournaments/show.html.erb')
-rw-r--r-- | app/views/tournaments/show.html.erb | 37 |
1 files changed, 5 insertions, 32 deletions
diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index d246f7a..b654804 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -40,35 +40,6 @@ <%= @tournament.max_teams_per_match %> </p> -<p> - <strong>Set rounds:</strong> - <%= @tournament.set_rounds %> -</p> - -<p> - <strong>Min players per team:</strong> - <%= @tournament.min_players_per_team %> -</p> - -<p> - <strong>Max players per team:</strong> - <%= @tournament.max_players_per_team %> -</p> - -<p> - <strong>Min teams per match:</strong> - <%= @tournament.min_teams_per_match %> -</p> - -<p> - <strong>Max teams per match:</strong> - <%= @tournament.max_teams_per_match %> -</p> - -<p> - <strong>Set rounds:</strong> - <%= @tournament.set_rounds %> -</p> <p> <strong>Randomized teams:</strong> @@ -108,8 +79,8 @@ <%# If user is the host, let them start the tournment %> <% if @tournament.hosts.include?(current_user) %> - <%= form_tag(tournaments_path.to_s + "/" + @tournament.id.to_s + "/edit", method: "get") do %> - <input type="hidden" name="close_action" value="close"> + <%= form_tag(tournament_path(@tournament), method: "put") do %> + <input type="hidden" name="update_action" value="start"> <% if @tournament.players.count >= @tournament.min_players_per_team * @tournament.min_teams_per_match %> <%= submit_tag("Start Tournament") %> <% else %> @@ -146,8 +117,10 @@ function donehandle( tournament ) { //if there are enough players to start, enable the button, else disable it. $("input[value=\"Start Tournament\"]").prop('disabled', (pct_complete >= 1)? false : true); + if (tournament["status"] == 1) + window.location.reload(true); } - setTimeout(function(){$.ajax({url: "<%= url_for @tournament %>.json"}).done(donehandle)}, 3000); + setTimeout(function(){$.ajax({url: "<%= url_for @tournament %>.json"}).done(donehandle)}, 2000); } $.ajax({url: "<%= url_for @tournament %>.json"}) |