effective_resources 2.0.2 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: aad99f05ab646eaf5777374411ea3cee95a7d6809a4dd1c9110ddd78b248e0a9
-  data.tar.gz: 79a500fabc0110e16298f4031004655ba2d317413a1df90eb31390add344745f
+  metadata.gz: 5179c0bb8855a9265428e895d5ba520ca3c30fc4a0e4a5f08d2cbe026bf7801a
+  data.tar.gz: 9c5e6364e79d82e6f4419f114f24fffc77431ce2e793c241b387c0c97b38b542
 SHA512:
-  metadata.gz: 211a18be0391a97797bab8d502ca0295c70cbe1d4a11da84e06fcf6f4187b1da9f027f85bda0cb513b6a4089d566f3698676ef973f4458ab7218bb2aebcb57ee
-  data.tar.gz: 87612647fbde94ec96a736c2c462b22021c644ef7496aa3feb7b1da63f15baf83337ca002ebf9c920112e7c43caaf9b9351ff5b73712fefc8b62a61e723eba49
+  metadata.gz: 84c8b8610fe599ac1c1c7ee706bed4fe5b5575f7a66aef64f37b51a27ed589a49bb788fba3984870a078528af397ada56208629d1c51b558fd0e3e66385a701e
+  data.tar.gz: 8717b561cdf65de63cb5e3b7dc6a84c41ba9347bc08dfef01000ed91f2c2a6ad79708b6ca7554382d07a1da52ed99afb70e17b69463c2e9ea54ec8f8bbecfe79

data/app/controllers/admin/select2_ajax_controller.rb

@@ -8,6 +8,12 @@ module Admin
     def users
       collection = current_user.class.all
 
+      if collection.respond_to?(:to_select2)
+        collection = collection.to_select2
+      elsif collection.respond_to?(:sorted)
+        collection = collection.sorted
+      end
+
       respond_with_select2_ajax(collection) do |user|
         { id: user.to_param, text: user.try(:to_select2) || to_select2(user) }
       end
@@ -16,7 +22,7 @@ module Admin
     private
 
     def to_select2(user)
-      "<span>#{user.first_name} #{user.last_name}</span> <small>#{user.email}</small>"
+      "<span>#{user}</span> <small>#{user.email}</small>"
     end
 
   end

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

@@ -200,6 +200,12 @@ module Effective
           return relation.where(klass.primary_key => maybe_id) if (maybe_id.to_i.to_s == maybe_id)
         end
 
+        # If the user specifies columns. Filter out invalid ones for this klass
+        if columns.present?
+          columns = Array(columns).map(&:to_s) - [nil, '']
+          columns = (columns & search_columns)
+        end
+
         # Otherwise, we fall back to a string/text search of all columns
         columns = Array(columns || search_columns).reject do |column|
           DO_NOT_SEARCH_EQUALS.any? { |value| column == value } ||
@@ -207,6 +213,8 @@ module Effective
           DO_NOT_SEARCH_END_WITH.any? { |value| column.end_with?(value) }
         end
 
+        return relation.none() if columns.blank?
+
         fuzzy = true unless fuzzy == false
 
         # Retval

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '2.0.2'.freeze
+  VERSION = '2.0.4'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.4
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-05 00:00:00.000000000 Z
+date: 2022-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails