Use foreign_key

activeadmin · Jan 28, 2020 · 38c227a · 38c227a
1 parent 90538e9
commit 38c227a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/lib/active_admin/mongoid/association/relatable.rb b/lib/active_admin/mongoid/association/relatable.rb
@@ -6,4 +6,9 @@ def macro
   def embeds?
     [:embeds_one, :embeds_many].include?(macro)
   end
+
+  def foreign_key
+    return if embeds?
+    foreign_key.to_sym rescue nil
+  end
 end
diff --git a/lib/active_admin/mongoid/filters/resource_extension.rb b/lib/active_admin/mongoid/filters/resource_extension.rb
@@ -6,7 +6,7 @@ def default_association_filters
       without_embedded = resource_class.reflect_on_all_associations.reject { |e| e.embeds? }
       poly, not_poly = without_embedded.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
 
-      filters = poly.map(&:foreign_type) + not_poly.map(&:name)
+      filters = poly.map(&:foreign_key) + not_poly.map(&:name)
       filters.map &:to_sym
     else
       []