Changeset 5301

Timestamp:

10/14/06 01:54:42 (2 years ago)

Author:

minam

Message:

make sure filters in subclasses with :only or :except conditions are treated like skip_filter calls

Files:

• trunk/actionpack/lib/action_controller/filters.rb (modified) (3 diffs)
• trunk/actionpack/test/controller/filters_test.rb (modified) (2 diffs)

trunk/actionpack/lib/action_controller/filters.rb

@@ -249 +249 @@
-      # will execute before the action on this controller is performed.
-      def append_before_filter(*filters, &block)
-
+
+
+
+
-      end
-
@@ -264 +267 @@
-      # that run _after_ actions on this controller are performed.
-      def append_after_filter(*filters, &block)
-
+
+
+
+
-      end
-
@@ -598 +604 @@
-          end
-        end
+
+        def look_for_existing_filters(filters, which)
+          filters, options = extract_conditions(filters)
+          old_filters = []
+
+          filter_chain.select(&"#{which}?".to_sym).each do |f|
+            old_filters << f.filter if filters.include?(f.filter)
+          end
+          
+          new_filters = filters - old_filters + [options]
+
+          if options[:except]
+            old_filters << { :only => options[:except] }
+          elsif options[:only]
+            old_filters << { :except => options[:only] }
+          else
+            old_filters = []
+          end
+
+          [new_filters, old_filters]
+        end
-    end
-

trunk/actionpack/test/controller/filters_test.rb

@@ -21 +21 @@
-      end
-  end
-
+
+
+
+
+
+
+
+
+
-  class TestMultipleFiltersController < ActionController::Base
-    before_filter :try_1
@@ -424 +432 @@
-  end
-
+  def test_changing_the_requirements
+    assert_equal nil, test_process(ChangingTheRequirementsController, "go_wild").template.assigns['ran_filter']
+  end
+
-  private
-    def test_process(controller, action = "show")