diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-04 08:35:35 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2009-05-04 08:35:35 -0700 |
commit | 8b6d2ef2f562c34ebc2ef547b0a18c31f5820569 (patch) | |
tree | b1397a8374b465ea2f300e776de126bb88386bcc /actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb | |
parent | d3ee8756c8b09b8524a9599926b02ededd27319c (diff) | |
parent | bcc4537f2a0d37fc02d67e9564fa5c9c5555b3d5 (diff) | |
download | rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.gz rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.tar.bz2 rails-8b6d2ef2f562c34ebc2ef547b0a18c31f5820569.zip |
Merge branch 'master' of git@github.com:rails/rails
Diffstat (limited to 'actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb')
-rw-r--r-- | actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb | 21 |
1 files changed, 21 insertions, 0 deletions
diff --git a/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb b/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb new file mode 100644 index 0000000000..02fa18211d --- /dev/null +++ b/actionpack/lib/action_dispatch/middleware/templates/rescues/template_error.erb @@ -0,0 +1,21 @@ +<h1> + <%=h @exception.original_exception.class.to_s %> in + <%=h @request.parameters["controller"].capitalize if @request.parameters["controller"]%>#<%=h @request.parameters["action"] %> +</h1> + +<p> + Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised: + <pre><code><%=h @exception.message %></code></pre> +</p> + +<p>Extracted source (around line <b>#<%=h @exception.line_number %></b>): +<pre><code><%=h @exception.source_extract %></code></pre></p> + +<p><%=h @exception.sub_template_message %></p> + +<% @real_exception = @exception + @exception = @exception.original_exception || @exception %> +<%= render :file => "rescues/_trace.erb" %> +<% @exception = @real_exception %> + +<%= render :file => "rescues/_request_and_response.erb" %> |