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

Changeset 1048

Show
Ignore:
Timestamp:
03/31/05 14:46:11 (3 years ago)
Author:
david
Message:

Improved the message display on the exception handler pages #963 [Johan Sorensen]

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/actionpack/CHANGELOG

    r1046 r1048  
    11*SVN* 
     2 
     3* Improved the message display on the exception handler pages #963 [Johan Sorensen] 
    24 
    35* Fixed that on very rare occasions, webrick would raise a NoMethodError: private method 'split' called for nil #1001 [Flurin Egger] 

  • trunk/actionpack/lib/action_controller/templates/rescues/diagnostics.rhtml

    r709 r1048  
    99  <%=h (@request.parameters["controller"] || "<controller not set>").capitalize %>#<%=h @request.parameters["action"] || "<action not set>" %> 
    1010</h1> 
    11 <p><%=h Object.const_defined?(:RAILS_ROOT) ? @exception.message.gsub(RAILS_ROOT, "") : @exception.message %></p> 
     11<pre><%=h Object.const_defined?(:RAILS_ROOT) ? @exception.message.gsub(RAILS_ROOT, "") : @exception.message %></pre> 
    1212 
    1313<% unless app_trace.empty? %><pre><code><%=h app_trace.join("\n") %></code></pre><% end %> 

  • trunk/actionpack/lib/action_controller/templates/rescues/routing_error.rhtml

    r617 r1048  
    11<h1>Routing Error</h1> 
    2 <p><%=h @exception.message %></p> 
     2<p><pre><%=h @exception.message %></pre></p> 
    33<% unless @exception.failures.empty? %><p> 
    44        <h2>Failure reasons:</h2> 
     5        <ol> 
    56        <% @exception.failures.each do |route, reason| %> 
    6                 <%=h route.inspect.gsub('\\', '') %> failed because <%=h reason.downcase %><br /> 
     7                <li><code><%=h route.inspect.gsub('\\', '') %></code> failed because <%=h reason.downcase %></li> 
    78  <% end %> 
     9  </ol> 
    810</p><% end %> 

  • trunk/actionpack/lib/action_controller/templates/rescues/template_error.rhtml

    r51 r1048  
    55 
    66<p> 
    7   Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised 
    8   <u><%=h @exception.message %></u> 
     7  Showing <i><%=h @exception.file_name %></i> where line <b>#<%=h @exception.line_number %></b> raised: 
     8  <pre><code><%=h @exception.message %></code></pre> 
    99</p> 
    1010 
    11 <pre><code><%=h @exception.source_extract %></code></pre> 
     11<p>Extracted source (around line <b>#<%=h @exception.line_number %></b>): 
     12<pre><code><%=h @exception.source_extract %></code></pre></p> 
    1213 
    1314<p><%=h @exception.sub_template_message %></p> 

  • trunk/actionpack/lib/action_view/helpers/pagination_helper.rb

    r1017 r1048  
    77    # <%= link_to "Previous page", { :page => paginator.current.previous } if paginator.current.previous %> 
    88    # 
    9     # <%= link_to "Next page", { :page => paginator.current.next } of paginator.current.next =%> 
     9    # <%= link_to "Next page", { :page => paginator.current.next } if paginator.current.next =%> 
    1010    module PaginationHelper 
    1111      unless const_defined?(:DEFAULT_OPTIONS)