jaculabilis/danbooru
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix 404/timeout errors not showing

Browse Source
This commit is contained in:
Toks
2014-11-25 21:04:03 -05:00
parent dd714d5bf6
commit 91270f4567
2 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/application_controller.rb
View File

@@ -32,11 +32,9 @@ protected
@exception = exception @exception = exception
if exception.is_a?(::ActiveRecord::StatementInvalid) && exception.to_s =~ /statement timeout/ if exception.is_a?(::ActiveRecord::StatementInvalid) && exception.to_s =~ /statement timeout/
@exception = nil
@error_message = "The database timed out running your query." @error_message = "The database timed out running your query."
render :template => "static/error", :status => 500 render :template => "static/error", :status => 500
elsif exception.is_a?(::ActiveRecord::RecordNotFound) elsif exception.is_a?(::ActiveRecord::RecordNotFound)
@exception = nil
@error_message = "That record was not found" @error_message = "That record was not found"
render :template => "static/error", :status => 404 render :template => "static/error", :status => 404
else else

2
app/views/static/error.html.erb
View File

@@ -6,6 +6,8 @@
<li style="list-style-type: none;"><%= b %></li> <li style="list-style-type: none;"><%= b %></li>
<%- end -%> <%- end -%>
</ul> </ul>
<% elsif @error_message %>
<p><%= @error_message %></p>
<% else %> <% else %>
<p><%= @exception.message %></p> <p><%= @exception.message %></p>
<% end %> <% end %>