From c347038869716ef145c700caf00f5c65c084dfaa Mon Sep 17 00:00:00 2001
From: dinedine <didier.lafforgue@gmail.com>
Date: Wed, 1 Sep 2010 00:41:55 +0200
Subject: [PATCH] re-activate custom application error page

---
 app/controllers/application_controller.rb | 10 ++++----
 doc/TODO                                  | 29 +++++++++++------------
 2 files changed, 19 insertions(+), 20 deletions(-)

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 6e5f9df7..3083b5cf 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -3,9 +3,9 @@ class ApplicationController < ActionController::Base
 
   protected
 
-  # rescue_from Exception, :with => :render_error
-  #
-  # def render_error
-  #   render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
-  # end
+  rescue_from Exception, :with => :render_error
+
+  def render_error
+    render :template => "/admin/errors/500", :layout => 'admin/box', :status => 500
+  end
 end
diff --git a/doc/TODO b/doc/TODO
index 5ad4aa87..5d6b5f74 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -1,19 +1,5 @@
 BOARD:
 
-x liquid inheritance
-x bug editable_xxx disabled for nil block
-! duplicated block name
-x display liquid errors
-x theme assets selector in page editor
-x saving page in ajax
-x editable_long_text tag
-x blocking issue when modifying the parent of 2 templates => one of the 2 children has reference of the first child
-x editable_file tag
-x stylish file field
-x remove not used editable element all in once
-x default content from parent editable element
-x unable to upload/remove editable file
-
 - refactor slugify method (use parameterize + create a module)
 - [content types] the "display column" selector should not include file types
 
@@ -85,4 +71,17 @@ x theme assets: disable version if not image (handled by the new version of Carr
 x rack app to map pretty asset url to S3 => shortcut urls instead
 x site selector (cross domain authentication)
 x nice error page
-x nice 404 page (admin section)
\ No newline at end of file
+x nice 404 page (admin section)
+x liquid inheritance
+x bug editable_xxx disabled for nil block
+! duplicated block name
+x display liquid errors
+x theme assets selector in page editor
+x saving page in ajax
+x editable_long_text tag
+x blocking issue when modifying the parent of 2 templates => one of the 2 children has reference of the first child
+x editable_file tag
+x stylish file field
+x remove not used editable element all in once
+x default content from parent editable element
+x unable to upload/remove editable file
\ No newline at end of file