effective_datatables 4.16.0 → 4.16.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb919d816894dbb8f980d70f0bcbe66706476bca2ceaa59c5a149b4c7342f23a
-  data.tar.gz: 0bf163d43e1ec174f76adedc190565f540a8191f33b5fa554093bf8a1be3398f
+  metadata.gz: '079ed09629f9c21a2d1e56da78d611258f57953200eba9724ee756c699db49ce'
+  data.tar.gz: 76fd2c6b7380bb02482312120c2b04ab68cd8a3e0e08c18815c838ac0f9ff58b
 SHA512:
-  metadata.gz: 8e847cb1063625374e346dea0b30e4c8b6416d2a73c0e7dcd330b27d4b4e8d61af9f8409565abedbdcf5185ea0d96fef6638a82c1c4f7c9c139020e10f6f2d1a
-  data.tar.gz: bb80cdb66df0055384d9c1021118590bd2c787c8fbf499fe7e5316b6c124a5d402c9f88196a2cb585a58f4dfac48f28df8f0ce052fdf31b829cff4c12461fbad
+  metadata.gz: 05ea2263405fbd49445e82e14240405794d14b86caf704115584f5de46ca1ba5fc8b685c2de66b612f3b540c80148ad6257cd3352a63e56bd02f6f303058af3b
+  data.tar.gz: cde3bf3b0bb9c8aa21b5b877da243c01069dcea07ca9e30d4b4e342839b66d7ecf5f1fe7087dbfbf5dc412d20a991b810171dea3c340934cf3da354b9f35e9d5

data/README.md

@@ -802,7 +802,7 @@ filters do
 end
 
 collection do
-  Things.where(updated_at: date_range)
+  Thing.where(updated_at: date_range)
 end
 ```
 

data/app/models/effective/datatable.rb

@@ -59,6 +59,16 @@ module Effective
       self.view = view if view
     end
 
+    # Checks en.datatables.admin/my_datatable
+    def self.datatable_name
+      value = I18n.t("datatables.#{name.underscore}").to_s
+      value.start_with?('translation missing:') ? name.titleize.split('/').last.chomp(' Datatable') : value
+    end
+
+    def datatable_name
+      self.class.datatable_name
+    end
+
     def rendered(params = {})
       raise('expected a hash of params') unless params.kind_of?(Hash)
 

data/app/models/effective/effective_datatable/csv.rb

@@ -24,7 +24,7 @@ module Effective
         if active_record_collection?
           collection_class.human_attribute_name(name)
         else
-          (name.to_s.split('.').last || '')
+          (name.to_s.split('.').last.titleize|| '')
         end
       end
 
@@ -32,8 +32,17 @@ module Effective
         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)
 

data/app/models/effective/effective_datatable/params.rb

@@ -10,20 +10,20 @@ module Effective
         return @_datatables_ajax_request unless @_datatables_ajax_request.nil?
         return unless view.respond_to?(:params)
 
-        @_datatables_ajax_request = (view.params.key?(:draw) && view.params.key?(:columns))
+        @_datatables_ajax_request = view.params.present? && (view.params.key?(:draw) && view.params.key?(:columns))
       end
 
       def datatables_inline_request?
         return @_datatables_inline_request unless @_datatables_inline_request.nil?
         return unless view.respond_to?(:params)
 
-        @_datatables_inline_request = (view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1])
+        @_datatables_inline_request = view.params.present? && (view.params[:_datatable_id].to_s.split('-')[0...-1] == to_param.split('-')[0...-1])
       end
 
       def params
         return {} unless view.present?
         return view.rendered_params if view.respond_to?(:rendered_params)
-        return {} unless view.respond_to?(:request)
+        return {} unless view.respond_to?(:request) && view.request.present?
 
         @params ||= {}.tap do |params|
           Rack::Utils.parse_query(URI(view.request.referer.presence || '/').query).each { |k, v| params[k.to_sym] = v }

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.16.0'.freeze
+  VERSION = '4.16.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.16.0
+  version: 4.16.2
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-03-08 00:00:00.000000000 Z
+date: 2023-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails