Ruby on Rails | Screencasts | Download | Documentation | Weblog | Community | Source

Changeset 2677

Show
Ignore:
Timestamp:
10/18/05 14:08:05 (3 years ago)
Author:
ulysses
Message:

Update error trace templates

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/actionpack/CHANGELOG

    r2665 r2677  
     1* Update error trace templates [Nicholas Seckar] 
     2 
     3* Stop showing generated routing code in application traces [Nicholas Seckar] 
     4 
    15*1.10.0* (October 16th, 2005) 
    26 
  • trunk/actionpack/lib/action_controller/templates/rescues/_trace.rhtml

    r2643 r2677  
    1  
    2 <% if @exception %> 
    31<% 
    4   clean_backtrace = @exception.clean_backtrace 
    5   app_trace       = @exception.application_backtrace 
    6   framework_trace = clean_backtrace - app_trace 
    7   traces = {"Application Trace" => app_trace, "Framework Trace" => framework_trace, "Full Trace" => clean_backtrace} 
    8   trace_names = ["Application Trace", "Framework Trace", "Full Trace"] 
     2  traces = [ 
     3    ["Application Trace", @exception.application_backtrace], 
     4    ["Framework Trace", @exception.framework_backtrace], 
     5    ["Full Trace", @exception.clean_backtrace] 
     6  ] 
     7  names = traces.collect {|name, trace| name} 
    98%> 
    109 
    1110<div id="traces"> 
    12   <% trace_names.each do |k| -%> 
    13     <div id="<%= k.gsub /\s/, '-' %>" style="display: <%= k == "Application Trace" ? 'block' : 'none' %>;"> 
    14       <% trace_names.each do |ok| -%> 
    15         <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 %> 
    16       <% end -%> 
    17       <pre><code><%= traces[k].join "\n" %></code></pre> 
     11  <% names.each do |name| -%> 
     12    <% 
     13      show = "document.getElementById('#{name.gsub /\s/, '-'}').style.display='block';" 
     14      hide = (names - [name]).collect {|hide_name| "document.getElementById('#{hide_name.gsub /\s/, '-'}').style.display='none';"} 
     15    %> 
     16    <a href="#" onclick="<%= hide %><%= show %>; return false;"><%= name %></a> <%= '|' unless names.last == name %> 
     17  <% end -%> 
     18 
     19  <% traces.each do |name, trace| -%> 
     20    <div id="<%= name.gsub /\s/, '-' %>" style="display: <%= name == "Application Trace" ? 'block' : 'none' %>;"> 
     21      <pre><code><%= trace.join "\n" %></code></pre> 
    1822    </div> 
    1923  <% end -%> 
    2024</div> 
    21 <% end %>