diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2006-04-04 19:37:29 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2006-04-04 19:37:29 +0000 |
| commit | e714b25723b674bb6d66af40ea9047166907616b (patch) | |
| tree | 757a0368a8cef19d5c951d68162ea73dabb6edaa /actionpack/lib/action_controller/templates/rescues | |
| parent | 62dc792a484e6e62fb2fb87fd47819144c5e3301 (diff) | |
| download | rails-e714b25723b674bb6d66af40ea9047166907616b.tar.gz rails-e714b25723b674bb6d66af40ea9047166907616b.tar.bz2 rails-e714b25723b674bb6d66af40ea9047166907616b.zip | |
Update the diagnostics template skip the useless '<controller not set>' text.
Fix symbol extensions test case.
Clean paths inside of exception messages and traces.
Add Pathname.clean_within for cleaning all the paths inside of a string.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4158 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'actionpack/lib/action_controller/templates/rescues')
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml index 584659252a..fa48b62f6f 100644 --- a/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml +++ b/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml @@ -1,6 +1,8 @@ <h1> - <%=h @exception.class.to_s %> in - <%=h (@request.parameters["controller"] || "<controller not set>").capitalize %>#<%=h @request.parameters["action"] || "<action not set>" %> + <%=h @exception.class.to_s %> + <% if @request.parameters['controller'] %> + in <%=h @request.parameters['controller'].humanize %>Controller<% if @request.parameters['action'] %>#<%=h @request.parameters['action'] %><% end %> + <% end %> </h1> <pre><%=h @exception.clean_message %></pre> |