effective_resources 1.9.12 → 1.9.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c84fc7b85367038b6acea82974e25be087fe2f1f5dc02acb26a642f2e30a4456
-  data.tar.gz: 18a47801a18fd254bb1d9d4b51ec7b0582194ecfd53442108d02c5b52b6dd560
+  metadata.gz: ed166aa8aeaf93b66de29429230623cad83d1b55f61b550f0b6e028d619c7362
+  data.tar.gz: 2843fd945c1c9dde784387b7db0d8b38187542f54aeaadee71876a1933c2c46f
 SHA512:
-  metadata.gz: 821be02e8c9302b4459facfddf6c64423040fd21da5627c6b32ef4ee72ea8e739df1fa4dc60037c9cf97cbf6b0eb83d4c7d6bf71268a4b0ac21513f9e8829f8e
-  data.tar.gz: 23917cb4747779edf1cd13014f1a181baebb0114c6035869dd72ee7eda95df0ec8a96ffbbb04c08c0ed631c92957d6a43418c5b9aaa7d76cc68ad86b42e5cae8
+  metadata.gz: 144e3041a712292e4a7becf6ff9e71c4092c50bff7ebbb06d13fc8f14f92c3ff9a1dcf3aaf20f4c5e5b06a1b6d52745930ab3fe877c88ca5f4c8c9d6a8ee16e3
+  data.tar.gz: e69d047183677c0176e6ffd941983a73bedf40040e49d413f1ea738766193eb686b52bfdb0063c7ca2f1bd637b753264708a99d41d254479689d2c52cc042fcf

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

@@ -21,7 +21,11 @@ module Effective
             collection ||= (klass.const_get(constant_pluralized) rescue nil) if defined?("#{klass.name}::#{constant_pluralized}")
           end
 
-          { as: :select, polymorphic: true, collection: (collection || []) }.compact
+          if collection.present?
+            { as: :select, polymorphic: true, collection: (collection || []) }
+          else
+            { as: :string }
+          end
         when :has_and_belongs_to_many
           { as: :select }.merge(search_form_field_collection(has_and_belongs_to_many(name)))
         when :has_many

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

@@ -98,8 +98,16 @@ module Effective
           elsif name == :user # Polymorphic user
             relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))
           else # Maybe from a string field
-            id ||= Effective::Attribute.new(:integer).parse(term)
-            relation.where("#{sql_column}_id = ? OR #{sql_column}_type = ?", id, (type || term))
+            collection = relation.none
+
+            relation.distinct("#{name}_type").pluck("#{name}_type").each do |klass_name|
+              resource = Effective::Resource.new(klass_name)
+              next unless resource.klass.present?
+
+              collection = collection.or(relation.where("#{name}_id": resource.search_any(term), "#{name}_type": klass_name))
+            end
+
+            collection
           end
         when :has_and_belongs_to_many, :has_many, :has_one
           relation.where(search_by_associated_conditions(association, term, fuzzy: fuzzy))

data/lib/effective_resources/version.rb

@@ -1,3 +1,3 @@
 module EffectiveResources
-  VERSION = '1.9.12'.freeze
+  VERSION = '1.9.13'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_resources
 version: !ruby/object:Gem::Version
-  version: 1.9.12
+  version: 1.9.13
 platform: ruby
 authors:
 - Code and Effect
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-12-22 00:00:00.000000000 Z
+date: 2021-12-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails