Merge pull request #5 from fortytools/fix_type_cast_for_rails_4_2_0

Fix usage of type_cast in preparation of rails 4.2.0 upgrade
FortySource · Feb 27, 2015 · cac1e1a · cac1e1a
2 parents 6d327f3 + dd12624
commit cac1e1a
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/lib/forty_facets/filter/facet_filter_definition.rb b/lib/forty_facets/filter/facet_filter_definition.rb
@@ -49,7 +49,7 @@ class AttributeFilter < FacetFilter
       def selected
         entity = definition.origin_class
         column = entity.columns_hash[definition.attribute.to_s]
-        values.map{|v| column.type_cast(v)}
+        values.map{|v| entity.connection.type_cast(v, column)}
       end
 
       def build_scope
@@ -169,6 +169,8 @@ def build_filter(search_instance, param_value)
           BelongsToFilter.new(self, search_instance, param_value)
         elsif association.macro == :has_many
           HasManyFilter.new(self, search_instance, param_value)
+        elsif association.macro == :has_and_belongs_to_many
+          HasManyFilter.new(self, search_instance, param_value)
         else
           raise "Unsupported association type: #{association.macro}"
         end