diff options
| author | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
|---|---|---|
| committer | AndrewMurrell <amurrel@purdue.edu> | 2014-04-06 22:20:28 -0400 |
| commit | bf798e57a760b68c3c7460789cef6389141c067d (patch) | |
| tree | 16cd7400b7f289b4aa6ec90e253c4d30d7a1a08c /app/controllers/tournaments_controller.rb | |
| parent | 91fee659eadaf6bcc4d063fd5645950da1250896 (diff) | |
| parent | 628173fce3de8f5d3e31109b3aa7c964fdab38ca (diff) | |
Merge branch 'master' of http://github.com/LukeShu/leaguer
Diffstat (limited to 'app/controllers/tournaments_controller.rb')
| -rw-r--r-- | app/controllers/tournaments_controller.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/controllers/tournaments_controller.rb b/app/controllers/tournaments_controller.rb index a9e91b0..2fc82ed 100644 --- a/app/controllers/tournaments_controller.rb +++ b/app/controllers/tournaments_controller.rb @@ -99,7 +99,7 @@ class TournamentsController < ApplicationController format.html { redirect_to @tournament, notice: 'You have joined this tournament.' } format.json { head :no_content } else - format.html { render action: 'permission_denied', status: :forbidden } + format.html { redirect_to @tournament, notice: "You don't have permission to start this tournament." } format.json { render json: "Permission denied", status: :forbidden } end end |