Skip to content

Commit 3e6b8d8

Browse files
Add macro to support mongoid 7
1 parent 52050d4 commit 3e6b8d8

File tree

3 files changed

+11
-1
lines changed

3 files changed

+11
-1
lines changed

lib/active_admin/mongoid.rb

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
require 'active_admin/mongoid/helpers/collection'
1414
require 'active_admin/mongoid/criteria'
1515
require 'active_admin/mongoid/order_clause'
16+
require 'active_admin/mongoid/association/relatable'
1617

1718
require 'active_admin/mongoid/inputs/filters/check_boxes_input'
1819
require 'active_admin/mongoid/inputs/filters/select_input'
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
Mongoid::Association::Relatable.module_eval do
2+
def macro
3+
self.class.name.split('::').last.underscore.to_sym
4+
end
5+
6+
def embeds?
7+
[:embeds_one, :embeds_many].include?(macro)
8+
end
9+
end

lib/active_admin/mongoid/filters/resource_extension.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
module ActiveAdmin::Filters::ResourceExtension
44
def default_association_filters
55
if resource_class.respond_to?(:reflect_on_all_associations)
6-
without_embedded = resource_class.reflect_on_all_associations.reject { |e| [:embeds_many, :embeds_one].include? e.macro }
6+
without_embedded = resource_class.reflect_on_all_associations.reject { |e| e.embeds? }
77
poly, not_poly = without_embedded.partition{ |r| r.macro == :belongs_to && r.options[:polymorphic] }
88

99
filters = poly.map(&:foreign_type) + not_poly.map(&:name)

0 commit comments

Comments
 (0)