diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-07 11:45:25 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2014-02-07 11:45:25 +0000 |
| commit | 98cbbdf7f1fac34b45f261584813538c60b047e0 (patch) | |
| tree | 7c3bc882c7937e2e896930a4b05beb7a5d6ab096 /app | |
| parent | 3d64938adcd4dd9372c0a47aa4f03b065d088279 (diff) | |
| download | redmine-98cbbdf7f1fac34b45f261584813538c60b047e0.tar.gz redmine-98cbbdf7f1fac34b45f261584813538c60b047e0.zip | |
Reverts r12855.
git-svn-id: http://svn.redmine.org/redmine/trunk@12856 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/application_controller.rb | 4 | ||||
| -rw-r--r-- | app/views/common/error.js.erb | 1 |
2 files changed, 0 insertions, 5 deletions
diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 8060c9e96..b297aa738 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -431,10 +431,6 @@ class ApplicationController < ActionController::Base format.html { render :template => 'common/error', :layout => use_layout, :status => @status } - format.js { - # Can't use an error status here, browsers wouldn't execute the JS response - render :template => 'common/error', :layout => false, :status => 200 - } format.any { head @status } end end diff --git a/app/views/common/error.js.erb b/app/views/common/error.js.erb deleted file mode 100644 index 81d377fe6..000000000 --- a/app/views/common/error.js.erb +++ /dev/null @@ -1 +0,0 @@ -alert("<%= raw escape_javascript @message %> (<%= raw escape_javascript @status.to_s %>)"); |