From 8e1f1ee44241838c2b701ad2622d98c9c41ea268 Mon Sep 17 00:00:00 2001
From: David Heinemeier Hansson <david@loudthinking.com>
Date: Sun, 12 Dec 2004 16:14:20 +0000
Subject: Moved require_association to associations.rb and added methods for
 resetting the inheritable attributes on subclasses

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@125 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
---
 actionpack/CHANGELOG                                                  | 2 ++
 .../lib/action_controller/support/class_inheritable_attributes.rb     | 4 ++++
 2 files changed, 6 insertions(+)

(limited to 'actionpack')

diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG
index 05569a2c06..a8fa53a143 100644
--- a/actionpack/CHANGELOG
+++ b/actionpack/CHANGELOG
@@ -1,5 +1,7 @@
 *SVN*
 
+* Added display of error messages with scaffolded form pages
+
 * Added option to ERB templates to swallow newlines by using <% if something -%> instead of just <% if something %>. Example:
 
     class SomeController < AbstractApplicationController
diff --git a/actionpack/lib/action_controller/support/class_inheritable_attributes.rb b/actionpack/lib/action_controller/support/class_inheritable_attributes.rb
index 7f061fdf1b..39312e8d5b 100644
--- a/actionpack/lib/action_controller/support/class_inheritable_attributes.rb
+++ b/actionpack/lib/action_controller/support/class_inheritable_attributes.rb
@@ -28,6 +28,10 @@ module ClassInheritableAttributes # :nodoc:
       inheritable_attributes[key]
     end
     
+    def reset_inheritable_attributes
+      inheritable_attributes.clear
+    end
+
     private 
       def inherited(child)
         @@classes[child] = inheritable_attributes.dup
-- 
cgit v1.2.3