Changeset 20

Timestamp:

10/10/2006 09:02:58 AM (2 years ago)

Author:

matthew

Message:

Fixed filter_options_for

Files:

• trunk/auto-admin/lib/auto_admin_configuration.rb (modified) (1 diff)
• trunk/auto-admin/lib/auto_admin_filter_sets.rb (modified) (1 diff)
• trunk/auto-admin/test/configuration_tests.rb (modified) (1 diff)

trunk/auto-admin/lib/auto_admin_configuration.rb

@@ -118 +118 @@
-
-    def filter_options_for column_name, custom_options, &block
-column_name
+self, reflect_on_association( column_name ) || find_column( column_name )
-    end
-    def filters

trunk/auto-admin/lib/auto_admin_filter_sets.rb

@@ -42 +42 @@
-      @options, @block = options, block
-    end
+    def sql_from_string option_name
+      @block ? @block.call( option_name ) : super
+    end
-    def other_options
-      a = []
-      @options.each do |k,v|
-        o = build_option( k, v )
-block.call( k ) unless 
+@block.call( k ) unless @
-        a << o
-      end

trunk/auto-admin/test/configuration_tests.rb

@@ -134 +134 @@
-
-
+  def test_filter_options_for
+    assert_equal [], Film.columns_for_filter
+    Film.filter_by :rating
+    Film.filter_options_for :rating, 'A' => 'X', 'B' => 'Y', 'C' => 'Z'
+    assert_equal [:rating], Film.columns_for_filter
+    assert_equal( { 'rating' => '*' }, Film.filter_defaults )
+    assert_equal ['rating = ?', 'B'], Film.filter_conditions( :rating => 'B' )
+  end
+  def test_filter_options_for_with_custom_sql_builder
+    assert_equal [], Film.columns_for_filter
+    Film.filter_by :length
+    Film.filter_options_for( :length, '0-60' => 'Very Short', '60-120' => 'Short', '120-999' => 'Long' ) do |val|
+      ["length BETWEEN ? AND ?", *( val.split('-').map {|n| n.to_i } )]
+    end
+    assert_equal [:length], Film.columns_for_filter
+    assert_equal( { 'length' => '*' }, Film.filter_defaults )
+    assert_equal ['length BETWEEN ? AND ?', 0, 60], Film.filter_conditions( :length => '0-60' )
+  end
-  def test_filter_by_string
-    assert_equal [], Film.columns_for_filter