effective_datatables 4.14.2 → 4.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5491d6a05966b96b5e693b56f12063faae6bc73023af3b80a912e9c86cf1f5f
-  data.tar.gz: 409e0101d6ee6f450bd76530814bb3e2a096c58acfd863eee22843c154023e2e
+  metadata.gz: 97162d77c01d7bc35d4d9bbda9b7f61d815628c7ded32c1c9c8a0a16e630c42f
+  data.tar.gz: 2bd27055dd9822c798373d0f073dc049ce471401cef071d50320a02f03d5c491
 SHA512:
-  metadata.gz: fa622fce78f2aaeb690221f9efa52e70c9f1376b3971234c1a9d342b8a84e5f3c6d83cf1144b1a1c7159627d59f5beb761e13f9ec15623a4d149f46092ecc0dd
-  data.tar.gz: 00a5f55efd132ea4aef1b989fd8d5d346228ddc0696c692580f1177e47ce2cce9f5dba9e46a25992ee35ab2001165ccc7ba57c0b93baba6a758237f78e1e2e68
+  metadata.gz: b7a59f37ce683bfb17e6b75715dee88a9125d26380988d7e9db9fd2c7f818e00235ee7418680d3dad90dabcf3c4e991bfb81ca32b7a4b80556573bf722a7e49f
+  data.tar.gz: 11d06c3f01185c4d92248bb40a32e78376eca5ae6bbbbabd5997a9a4a0a52f4d6ce1fb70bca5b6c50aa4ad60fb747b7060b3aaaf39bae0fbb5d51420cfbe9cef

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

@@ -95,7 +95,9 @@ module Effective
         value = obj_to_value(row[index], column, row)
         next if value.nil? || value == ''
 
-        case column[:as]
+        obj_equals = obj.respond_to?(column[:name]) && obj.send(column[:name]).to_s.downcase == term_downcased
+
+        obj_equals || case column[:as]
         when :boolean
           if fuzzy
             term ? (obj == true) : (obj != true)

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.2'.freeze
+  VERSION = '4.15.1'.freeze
 end

metadata

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