effective_datatables 4.14.1 → 4.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9504d0adc46bb18b44f0f39600966cbd7706c10598874a21c932ff7b00089032
-  data.tar.gz: 6cc0623cb402890be52af4179ad4083707778454c6846465844fc8f2cd766588
+  metadata.gz: e8e433f359f9879d96a6a5fc387d7a17bc00b7aa351c6d7e26ffc8b2bcccca10
+  data.tar.gz: df96403a27342d13874832a107195ba75561410d08cf1893fccb75dceff79e80
 SHA512:
-  metadata.gz: 85e973dfd64010d90dba19b4124e15fe08bfaa17222d28adcefdd756d9566a066494222196f5e19b2d43b8f999fa6670ac0e658272c87406845cb355dd24bd8f
-  data.tar.gz: 94f3f5d792fefad761279f1ba8955aa878ead86188d5d68737594da33c74b8d00d02a4f2fab708b3f31d302baa38b19c5abfcb164c5d7c9ba1a17febeb0773dd
+  metadata.gz: 623e9378a8787d73d6204ea0356382a1230d991634d2ae1c58fb8babfbae0fee872985e0ae052d12934fe1d673a3e142616fc58d0e03085ef3a08adce692f942
+  data.tar.gz: 674f3b2d483621875d760834629d2c3964f0a6a006ec6b932466e0ee23580c1767a156ee5556ac6b5c0b40b525935dc906dca7e987e2c4bea2e6aa200f08a7bd

data/app/helpers/effective_datatables_private_helper.rb

@@ -59,10 +59,25 @@ module EffectiveDatatablesPrivateHelper
     when :reorder
       content_tag(:span, t('effective_datatables.reorder'), style: 'display: none;')
     else
-      content_tag(:span, opts[:label].presence)
+      label = opts[:label].presence || datatable_human_attribute_name(datatable, name, opts)
+      content_tag(:span, label)
     end
   end
 
+  def datatable_human_attribute_name(datatable, name, opts)
+    return (name.to_s.split('.').last || '').titleize unless datatable.active_record_collection?
+
+    case opts[:as]
+    when :belongs_to
+      opts[:resource].human_name
+    when :has_many
+      opts[:resource].human_plural_name
+    else
+      datatable.collection_class.human_attribute_name(name)
+    end
+
+  end
+
   def datatable_search_tag(datatable, name, opts)
     return datatable_new_resource_button(datatable, name, opts) if name == :_actions
 

data/app/models/effective/datatable_value_tool.rb

@@ -79,7 +79,7 @@ module Effective
     def search_column(collection, original, column, index)
       Rails.logger.info "VALUE TOOL: search_column #{column.to_s} #{original} #{index}" if EffectiveDatatables.debug
 
-      fuzzy = column[:search][:fuzzy]
+      fuzzy = (column[:search][:operation] == :matches)
 
       term = Effective::Attribute.new(column[:as]).parse(original, name: column[:name])
       term_downcased = term.to_s.downcase

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

@@ -15,7 +15,17 @@ module Effective
       end
 
       def csv_header
-        columns.map { |_, opts| opts[:label] || '' }
+        columns.map do |name, opts|
+          opts[:label].presence || csv_human_attribute_name(name)
+        end
+      end
+
+      def csv_human_attribute_name(name)
+        if active_record_collection?
+          collection_class.human_attribute_name(name)
+        else
+          (name.to_s.split('.').last || '')
+        end
       end
 
       def csv_file

data/app/models/effective/effective_datatable/dsl/datatable.rb

@@ -51,7 +51,7 @@ module Effective
             csv: csv,
             format: (format if block_given?),
             index: nil,
-            label: (label.nil? ? name.to_s.split('.').last.titleize : label),
+            label: label,
             name: name,
             partial: partial,
             partial_as: partial_as,
@@ -80,7 +80,7 @@ module Effective
             csv: csv,
             format: nil,
             index: nil,
-            label: (label.nil? ? name.to_s.split('.').last.titleize : label),
+            label: label,
             name: name,
             partial: partial,
             partial_as: partial_as,

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.14.1'.freeze
+  VERSION = '4.15.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_datatables
 version: !ruby/object:Gem::Version
-  version: 4.14.1
+  version: 4.15.0
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-04 00:00:00.000000000 Z
+date: 2023-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails