From 7db19de3665d9f0c60e1dd1d30a58b6ea0692fc1 Mon Sep 17 00:00:00 2001
From: Nicolae Claudius <nicolae_claudius@yahoo.com>
Date: Wed, 21 Sep 2011 07:02:20 -0700
Subject: [PATCH] error messages

---
 app/controllers/application_controller.rb | 11 +++++++++++
 app/views/errors/_messages.html.erb       | 10 ++++++++++
 app/views/errors/access_denied.html.erb   | 11 +++++++++++
 app/views/errors/access_denied.js.rjs     |  5 +++++
 4 files changed, 37 insertions(+)
 create mode 100644 app/views/errors/_messages.html.erb
 create mode 100644 app/views/errors/access_denied.html.erb
 create mode 100644 app/views/errors/access_denied.js.rjs

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index b4b2114..6cd30c3 100644
--- a/app/controllers/application_controller.rb
+++ b/app/controllers/application_controller.rb
@@ -2,4 +2,15 @@ class ApplicationController < ActionController::Base
   before_filter :authenticate_user!
   include SentientController
   protect_from_forgery
+  
+  rescue_from CanCan::AccessDenied, ActiveScaffold::ActionNotAllowed do |exception|
+    flash.now[:error] = exception.message
+    render :template => 'errors/access_denied', :layout => 'errors'
+  end
+
+  rescue_from ActiveScaffold::ActionNotAllowed do |exception|
+    flash.now[:error] = I18n.t("action_not_allowed")
+    render :template => 'errors/access_denied', :layout => 'errors'
+  end
+  
 end
diff --git a/app/views/errors/_messages.html.erb b/app/views/errors/_messages.html.erb
new file mode 100644
index 0000000..4d87e19
--- /dev/null
+++ b/app/views/errors/_messages.html.erb
@@ -0,0 +1,10 @@
+<% for name in [:info, :warning, :error] %>
+  <% if flash[name] %>
+    <div class="<%= "#{name}-message message" %>">
+      <%= h flash[name] %>
+      <% if request.xhr? %>
+        <a href="#" onclick="ActiveScaffold.remove(this.parentNode); return false;" title="<%= as_(:close) %>"><%= as_(:close) %></a>
+      <% end %>
+    </div>
+  <% end %>
+<% end %>
diff --git a/app/views/errors/access_denied.html.erb b/app/views/errors/access_denied.html.erb
new file mode 100644
index 0000000..69c2980
--- /dev/null
+++ b/app/views/errors/access_denied.html.erb
@@ -0,0 +1,11 @@
+<div class="main_container">
+  <div class="sheet error-sheet">
+    <% if request.xhr? %>
+      <br />
+      <%= render(:partial => 'messages') %>
+      <br />
+    <% else %>
+      <%= link_to 'Back', :back %>
+    <% end %>
+  </div>
+</div>
diff --git a/app/views/errors/access_denied.js.rjs b/app/views/errors/access_denied.js.rjs
new file mode 100644
index 0000000..7340571
--- /dev/null
+++ b/app/views/errors/access_denied.js.rjs
@@ -0,0 +1,5 @@
+if controller.class.uses_active_scaffold?
+  form_selector = "#{element_form_id(:action => params[:action])}"
+  page << "var action_link = ActiveScaffold.find_action_link('#{form_selector}');"
+  page << "action_link.update_flash_messages('#{escape_javascript(render(:partial => 'messages').strip)}');"
+end