diff options
| author | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
|---|---|---|
| committer | nfoy <nfoy@purdue.edu> | 2014-03-06 20:40:18 -0500 |
| commit | a892016443d4845c1f738bcc57db82174c53701c (patch) | |
| tree | f05cfe552d4b7c6793b172aa6b92906a0b2241fa /app/views/tournaments | |
| parent | e10bf58ec059ec263c1d1a9dcac608475377868a (diff) | |
| parent | 7bcd854443e368806cf1f4ece562c157db723d1a (diff) | |
Merge branch 'master' of https://github.com/LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'app/views/tournaments')
| -rw-r--r-- | app/views/tournaments/new.html.erb | 3 | ||||
| -rw-r--r-- | app/views/tournaments/show.html.erb | 7 |
2 files changed, 7 insertions, 3 deletions
diff --git a/app/views/tournaments/new.html.erb b/app/views/tournaments/new.html.erb index 1e80147..8c74068 100644 --- a/app/views/tournaments/new.html.erb +++ b/app/views/tournaments/new.html.erb @@ -1,8 +1,5 @@ -<%= javascript_include_tag :defaults %> - <h1>New Tournament</h1> - <%= form_tag(new_tournament_path, method: "get") do %> <%= select_tag('game', options_from_collection_for_select(@games, 'id', 'name', @tournament.game.nil? || @tournament.game.id), diff --git a/app/views/tournaments/show.html.erb b/app/views/tournaments/show.html.erb index 4f97c7c..91c1961 100644 --- a/app/views/tournaments/show.html.erb +++ b/app/views/tournaments/show.html.erb @@ -1,3 +1,10 @@ +<% if @tournament.joinable_by?(current_user) %> + <%= form_tag(tournament_path(@tournament), method: "put") do %> + <input type="hidden" name="update_action" value="join"> + <%= submit_tag("Join") %> + <% end %> +<% end %> + <p> <strong>Game:</strong> <%= @tournament.game %> |