app/models/effective/effective_datatable/csv.rb in effective_datatables-4.16.1 vs app/models/effective/effective_datatable/csv.rb in effective_datatables-4.16.2

@@ -22,19 +22,28 @@
 
       def csv_human_attribute_name(name)
         if active_record_collection?
           collection_class.human_attribute_name(name)
         else
-          (name.to_s.split('.').last || '')
+          (name.to_s.split('.').last.titleize|| '')
         end
       end
 
       def csv_file
         CSV.generate do |csv|
           csv << csv_header()
 
-          collection.find_in_batches do |resources|
-            resources = arrayize(resources, csv: true)
+          if active_record_collection?
+            collection.find_in_batches do |resources|
+              resources = arrayize(resources, csv: true)
+              format(resources, csv: true)
+              finalize(resources)
+
+              resources.each { |resource| csv << resource }
+            end
+          else
+            resources = collection
+
             format(resources, csv: true)
             finalize(resources)
 
             resources.each { |resource| csv << resource }
           end