effective_datatables 4.17.0 → 4.17.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5fa644f48b7deb7204d3d7c6486dcdc90801075f580b721a9ae14ada37b38fae
-  data.tar.gz: 93915b2419ba86c9783e6e7dc227a7fdd131eafe43e7534c7dd862df66fd6977
+  metadata.gz: ad7b621e95979cb0e0e41548ef4993a0efd1ca7f1d262656c4a04e611f99fe3d
+  data.tar.gz: 657a4d88aab6e8eff27c86611bff1f35862b69fa30422fe2e29eb3ad0ecb7159
 SHA512:
-  metadata.gz: b92b2429d730b12d36d47c0ad01f0ee347d2e985a14c99d8d15c7d524ff80660762b50b84455ba4cf35e80e3ac36425d37311021227995ceec95f26310829e21
-  data.tar.gz: 6362c1329baebcedccb025f3e1ad7eae2fb1f30475f9013cd5840e515e26bcca16fedf9df6a5f212e11528e83bb2a15a3a8834f53c180e5ca5081e94e4e0af95
+  metadata.gz: 033e9e91e76c4682a5dd7bcc02cb68ae4e17558bfe22f665f476ed970b2c75790b9a87e3982b74a254777b9edc6fdfa80e51e88f082c770c76511cbbeecf7800
+  data.tar.gz: 5e3c4745edf257887fa236e0d974985a235599884ce912088140290afcdadcd13cd9ed9846d7bf2f758b4de0546b3d51c885b8aeeeeed90295de2f02ce7cfb3f

data/app/helpers/effective_datatables_private_helper.rb

@@ -69,13 +69,19 @@ module EffectiveDatatablesPrivateHelper
 
     case opts[:as]
     when :belongs_to
-      opts[:resource].human_name
+      foreign_key = opts[:resource].initialized_name.try(:foreign_key).to_s.downcase
+      klass_name = opts[:resource].initialized_name.try(:class_name).to_s.downcase
+
+      if foreign_key.starts_with?(klass_name)
+        opts[:resource].human_name
+      else
+        datatable.collection_class.human_attribute_name(name)
+      end
     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)

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

@@ -178,6 +178,8 @@ module Effective
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
           elsif search[:collection].kind_of?(Array) && search[:collection].first.kind_of?(ActiveRecord::Base)
             search[:collection] = search[:collection].map { |obj| [obj.to_s, obj.id] }
+          elsif search[:collection].kind_of?(Array)
+            search[:collection] = search[:collection]
           end
 
           search[:as] ||= :select if search.key?(:collection)
@@ -189,6 +191,8 @@ module Effective
 
           if array_collection? && opts[:resource].present?
             search.reverse_merge!(search_resource.search_form_field(name, collection.first[opts[:index]]))
+          elsif search[:as] == :select && search[:collection].kind_of?(Array)
+            # Nothing to do
           elsif search[:as] != :string
             search.reverse_merge!(search_resource.search_form_field(name, opts[:as]))
           end

data/lib/effective_datatables/version.rb

@@ -1,3 +1,3 @@
 module EffectiveDatatables
-  VERSION = '4.17.0'.freeze
+  VERSION = '4.17.2'.freeze
 end

metadata

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