app/controllers/administrate/application_controller.rb in administrate-0.5.0 vs app/controllers/administrate/application_controller.rb in administrate-0.6.0

@@ -3,10 +3,11 @@
     protect_from_forgery with: :exception
 
     def index
       search_term = params[:search].to_s.strip
       resources = Administrate::Search.new(resource_resolver, search_term).run
+      resources = resources.includes(*resource_includes) if resource_includes.any?
       resources = order.apply(resources)
       resources = resources.page(params[:page]).per(records_per_page)
       page = Administrate::Page::Collection.new(dashboard, order: order)
 
       render locals: {
@@ -71,15 +72,11 @@
 
     private
 
     helper_method :nav_link_state
     def nav_link_state(resource)
-      if resource_name.to_s.pluralize == resource.to_s
-        :active
-      else
-        :inactive
-      end
+      resource_name.to_s.pluralize == resource.to_s ? :active : :inactive
     end
 
     helper_method :valid_action?
     def valid_action?(name, resource = resource_name)
       !!routes.detect do |controller, action|
@@ -107,9 +104,13 @@
       @_requested_resource ||= find_resource(params[:id])
     end
 
     def find_resource(param)
       resource_class.find(param)
+    end
+
+    def resource_includes
+      dashboard.association_includes
     end
 
     def resource_params
       params.require(resource_name).permit(dashboard.permitted_attributes)
     end