diff options
| author | Nicholas Seckar <nseckar@gmail.com> | 2005-10-18 14:08:05 +0000 |
|---|---|---|
| committer | Nicholas Seckar <nseckar@gmail.com> | 2005-10-18 14:08:05 +0000 |
| commit | 7d8ecad127c8e7b2ffcab883c71e16414a4261c2 (patch) | |
| tree | 7831c80fade6185796a94d799f06487fe39b8775 | |
| parent | 60b6fac5deec3317acaca8dc3d399faea25223b2 (diff) | |
| download | rails-7d8ecad127c8e7b2ffcab883c71e16414a4261c2.tar.gz rails-7d8ecad127c8e7b2ffcab883c71e16414a4261c2.tar.bz2 rails-7d8ecad127c8e7b2ffcab883c71e16414a4261c2.zip | |
Update error trace templates
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2677 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
| -rw-r--r-- | actionpack/CHANGELOG | 4 | ||||
| -rw-r--r-- | actionpack/lib/action_controller/templates/rescues/_trace.rhtml | 33 |
2 files changed, 22 insertions, 15 deletions
diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1c6585c27f..993ccbd122 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,3 +1,7 @@ +* Update error trace templates [Nicholas Seckar] + +* Stop showing generated routing code in application traces [Nicholas Seckar] + *1.10.0* (October 16th, 2005) * Make string-keys locals assigns optional. Add documentation describing depreciated state [skaes@web.de] diff --git a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml index 897320d767..8175fbf18e 100644 --- a/actionpack/lib/action_controller/templates/rescues/_trace.rhtml +++ b/actionpack/lib/action_controller/templates/rescues/_trace.rhtml @@ -1,21 +1,24 @@ - -<% if @exception %> <% - clean_backtrace = @exception.clean_backtrace - app_trace = @exception.application_backtrace - framework_trace = clean_backtrace - app_trace - traces = {"Application Trace" => app_trace, "Framework Trace" => framework_trace, "Full Trace" => clean_backtrace} - trace_names = ["Application Trace", "Framework Trace", "Full Trace"] + traces = [ + ["Application Trace", @exception.application_backtrace], + ["Framework Trace", @exception.framework_backtrace], + ["Full Trace", @exception.clean_backtrace] + ] + names = traces.collect {|name, trace| name} %> <div id="traces"> - <% trace_names.each do |k| -%> - <div id="<%= k.gsub /\s/, '-' %>" style="display: <%= k == "Application Trace" ? 'block' : 'none' %>;"> - <% trace_names.each do |ok| -%> - <a href="#" onclick="document.getElementById('<%= k.gsub /\s/, '-' %>').style.display='none'; document.getElementById('<%= ok.gsub /\s/, '-' %>').style.display='block'; return false;"><%= ok %></a> <%= '|' unless trace_names.last == ok %> - <% end -%> - <pre><code><%= traces[k].join "\n" %></code></pre> + <% names.each do |name| -%> + <% + show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';" + hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub /\s/, '-'}').style.display='none';"} + %> + <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %> + <% end -%> + + <% traces.each do |name, trace| -%> + <div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;"> + <pre><code><%= trace.join "\n" %></code></pre> </div> <% end -%> -</div> -<% end %>
\ No newline at end of file +</div>
\ No newline at end of file |