effective_resources 2.7.18 → 2.7.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8cb774d8092e1d120c9f5bf14600c29f62ed85e199c026574f90bc53293d84
-  data.tar.gz: fb5b45d090befa10ffa7dd289f62e25cb40b9100875b1ec9cab576af91a15131
+  metadata.gz: 52a66ec32a1b5da770279f4f21a9ae8cf42f2bd5f96250510cd9894c36e7965b
+  data.tar.gz: b6ffacf0caef1d406988c4d51bf2a622bce4ff5cec1171e77a622c056b757bac
 SHA512:
-  metadata.gz: ff7e338aad72728753ff9c70c49aa2bcad9bb21073a2df1b208fe359dcb54c2c4f577d663a7d5430a40eefcf67359ee384200c4e238cafd5deb6d0bf8c412ed5
-  data.tar.gz: 31064f8ff830d0db9355d076b60313d6941e6df644619928e3c02d46d7e97709bdbd79557be0df5e82eb144491c3b8473d077ec16e3f9a2d065812e0e8578c23
+  metadata.gz: 8334b1b3e37bfb79707a65529efed084d3f43d901b3c21cdb0cfc377a6eb152d759bb3a2168525d503a8cdfa2836e1205b23b29c39c6128df6efe4885c0cdee1
+  data.tar.gz: 11126e1402eadcad2f2bce9e6082075762f4b51034635a4ece7e4fb368784b93c69d834e877a95f1a55ac1a9714de4b5df0eefc5a38949e77c8e576b2fb8456d

data/app/controllers/concerns/effective/select2_ajax_controller.rb

@@ -17,7 +17,8 @@ module Effective
 
       # Search
       if (term = params[:term]).present? && !skip_search
-        collection = Effective::Resource.new(collection).search_any(term, columns: [:email, :first_name, :last_name])
+        columns = collection.klass.new.try(:to_select2_search_columns).presence
+        collection = Effective::Resource.new(collection).search_any(term, columns: columns)
       end
 
       # Paginate

data/app/models/effective/resources/relation.rb

@@ -62,6 +62,9 @@ module Effective
         when :string, :text
           relation
             .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column}='' ASC, #{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
+        when :date, :datetime
+          relation
+            .order(Arel.sql(("ISNULL(#{sql_column}), " if mysql?).to_s + "#{sql_column} #{sql_direction}" + (" NULLS LAST" if postgres?).to_s))
         else
           relation
             .order(Arel.sql("#{sql_column} #{sql_direction}"))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.18'.freeze
+  VERSION = '2.7.20'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.18
+  version: 2.7.20
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-06 00:00:00.000000000 Z
+date: 2023-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails