Changeset 32 for trunk

Timestamp:

06/25/2007 02:35:19 PM (2 years ago)

Author:

matthew

Message:

Added support for filtering by membership in a has_and_belongs_to_many
relationship, along with a basic 'multiselect' helper for maintaining
them.

Files:

• trunk/auto-admin/lib/auto_admin_configuration.rb (modified) (2 diffs)
• trunk/auto-admin/lib/auto_admin_filter_sets.rb (modified) (3 diffs)
• trunk/auto-admin/lib/auto_admin_simple_theme.rb (modified) (2 diffs)

trunk/auto-admin/lib/auto_admin_configuration.rb

@@ -124 +124 @@
-      (@custom_filter_options ||= {})[column_name.to_sym] = AutoAdmin::CustomFilterSet.new( self, reflect_on_association( column_name ) || find_column( column_name ), custom_options, &block )
-    end
+    def dynamic_filter_options_for column_name, &block
+      filter_options_for( column_name, block )
+    end
-    def filters
-      columns_for_filter.map { |col| filter_instance( col ) }
@@ -134 +137 @@
-      when :belongs_to: AutoAdmin::AssociationFilterSet
-      when :has_one: AutoAdmin::AssociationFilterSet
+      when :has_many: AutoAdmin::MultiAssociationFilterSet
+      when :has_and_belongs_to_many: AutoAdmin::MultiAssociationFilterSet
-      when :datetime: AutoAdmin::DateFilterSet
-      else

trunk/auto-admin/lib/auto_admin_filter_sets.rb

@@ -47 +47 @@
-    def other_options
-      a = []
-
+
+
+
-        o = build_option( k, v )
-        o[:sql] = @block.call( k ) unless @block.nil?
@@ -91 +93 @@
-    end
-    def sql_column
-(assoc.options && assoc.options[:foreign_key]) || (assoc.name.to_s + '_id')
+assoc.association_foreign_key
-    end
-    def objects
@@ -104 +106 @@
-    def sql_from_string option_name
-      sql_from_value option_name.to_i
+    end
+  end
+  class MultiAssociationFilterSet < AssociationFilterSet
+    def sql_from_value option_name
+      ["EXISTS(SELECT * FROM #{assoc.options[:join_table]} WHERE #{assoc.primary_key_name} = #{assoc.active_record.primary_key} AND #{assoc.association_foreign_key} = ?)", option_name]
-    end
-  end

trunk/auto-admin/lib/auto_admin_simple_theme.rb

@@ -178 +178 @@
-    def get_column_from_field(field)
-      assoc = model.reflect_on_association( field.to_sym )
-assoc.primary_key_name
+([:has_many, :has_and_belongs_to_many].include?(assoc.macro) ? "#{field.to_s.singularize}_ids" : assoc.primary_key_name)
-    end
-
@@ -286 +286 @@
-      end
-      super( field, dropdown_options, options, html_options )
+    end
+    def multiselect(field, options = {}, html_options = {})
+      common_option_translations! options
+      dropdown_options = find_choices(field, options)
+      column = get_column_from_field(field)
+      html_defaults = { :size => 8, :multiple => true,
+        :name => "#{@object_name}[#{column}][]",
+        :id => "#{@object_name}_#{column}" }
+
+      helpers.content_tag('select', helpers.options_for_select( dropdown_options, @object && @object.send(column) ), html_defaults.merge( html_options ) )
-    end
-    def radio_group(field, options = {})