use the association includes in the has_many resources as well

thoughtbot · May 2, 2017 · 1ce0a5a · 1ce0a5a
1 parent 16f184f
commit 1ce0a5a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/lib/administrate/field/has_many.rb b/lib/administrate/field/has_many.rb
@@ -38,7 +38,8 @@ def permitted_attribute
       end
 
       def resources(page = 1)
-        order.apply(data).page(page).per(limit)
+        resources = order.apply(data).page(page).per(limit)
+        includes.any? ? resources.includes(*includes) : resources
       end
 
       def more_than_limit?
@@ -47,6 +48,10 @@ def more_than_limit?
 
       private
 
+      def includes
+        associated_dashboard.association_includes
+      end
+
       def candidate_resources
         if options.key?(:includes)
           includes = options.fetch(:includes)