| @@ -0,0 +1,1 | |||||
|
|
1 | alert("<%= raw escape_javascript @message %> (<%= raw escape_javascript @status.to_s %>)"); | |||
| @@ -431,6 +431,10 class ApplicationController < ActionController::Base | |||||
| 431 | format.html { |
|
431 | format.html { | |
| 432 | render :template => 'common/error', :layout => use_layout, :status => @status |
|
432 | render :template => 'common/error', :layout => use_layout, :status => @status | |
| 433 | } |
|
433 | } | |
|
|
434 | format.js { | |||
|
|
435 | # Can't use an error status here, browsers wouldn't execute the JS response | |||
|
|
436 | render :template => 'common/error', :layout => false, :status => 200 | |||
|
|
437 | } | |||
| 434 | format.any { head @status } |
|
438 | format.any { head @status } | |
| 435 | end |
|
439 | end | |
| 436 | end |
|
440 | end | |
General Comments 0
You need to be logged in to leave comments.
Login now