effective_resources 2.7.17 → 2.7.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d6b751ebab2af1f4b5ce1a6023628b4f71708c9201588827ca85b5463fddb94
-  data.tar.gz: 94016eb862f9a86023b4bbafc085ace95fe691b91a8d2306a7be8fd4496ce5dc
+  metadata.gz: 1f3c2935ca26bb5e2275b6d035bc98fa19f6fdb0bb63be57b1f45a7dc6a46a93
+  data.tar.gz: 7a61e1b4d7a7ad0fbd7834fb930f10a1a860699a578f6eaeaf227f2a121173bf
 SHA512:
-  metadata.gz: 84623889aa71be0d8a29af1c09c03392543ba979a8d0c9c488b2cf50b2907df38ff0944bb75c8276a87542b645064ba6f69038c96d3a69dca36a0ab43eb06e1b
-  data.tar.gz: e211971173259ea986f4f9fabb7801b5d1f161ec121b71bcdcadc1ab2e7869e37f1d7b4847b4e6d14cfc8953fba3a421dc443a5f59cd82dedefc3d6a67328a32
+  metadata.gz: 0a9c46b85be8c1cec2b70787ac4a8413b2694e574a9b82937faf18ff35b5f1fac015585d16e25a84962a87fce0aed032fa45a9097b56c26c868b30c6844441c0
+  data.tar.gz: 4ed252ae6da3efe34ebca6a5591c5690c33e4d7ee3029f80c695767a66534ec17a623eeb9bf2a1b579e0ee57337be6cfcd3803e9504fd4027406c0ea8fcdf2e2

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

@@ -59,9 +59,12 @@ module Effective
         when :time
           relation
             .order(Arel.sql("EXTRACT(hour from #{sql_column}) #{sql_direction}, EXTRACT(minute from #{sql_column}) #{sql_direction}"))
-        else
+        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))
+        else
+          relation
+            .order(Arel.sql("#{sql_column} #{sql_direction}"))
         end
       end
 

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.7.17'.freeze
+  VERSION = '2.7.19'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.7.17
+  version: 2.7.19
 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