diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2014-03-06 22:17:36 -0500 |
| commit | 5f2247dd1e701a91fb0359bf7265bdadd5486a60 (patch) | |
| tree | 8966f53e304731faf26b19230439f831b215d3f1 /app/views/matches/index.html.erb | |
| parent | 4a91128f6fe20d95b6692abaa5e6c4dc92418b46 (diff) | |
| parent | 2bfc17c39f9b8b5ea71d36d2d5f041295f24192f (diff) | |
Merge branch 'master' of github.com:LukeShu/leaguer
Conflicts:
config/routes.rb
Diffstat (limited to 'app/views/matches/index.html.erb')
| -rw-r--r-- | app/views/matches/index.html.erb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/app/views/matches/index.html.erb b/app/views/matches/index.html.erb index 0742770..d635834 100644 --- a/app/views/matches/index.html.erb +++ b/app/views/matches/index.html.erb @@ -12,13 +12,13 @@ </thead> <tbody> - <% @matches.each do |match| %> + <% @tournament.matches.each do |match| %> <tr> <td><%= match.tournament %></td> <td><%= match.name %></td> - <td><%= link_to 'Show', match %></td> - <td><%= link_to 'Edit', edit_match_path(match) %></td> - <td><%= link_to 'Destroy', match, method: :delete, data: { confirm: 'Are you sure?' } %></td> + <td><%= link_to 'Show', tournament_match_path(@tournament, match) %></td> + <td><%= link_to 'Edit', edit_tournament_match_path(@tournament, match) %></td> + <td><%= link_to 'Destroy', tournament_match_path(@tournament, match), method: :delete, data: { confirm: 'Are you sure?' } %></td> </tr> <% end %> </tbody> @@ -26,4 +26,4 @@ <br> -<%= link_to 'New Match', new_match_path %> +<%= link_to 'New Match', new_tournament_match_path %> |