fix(search): does not apply the extended search for polymorphic relat…

…ionships (#684)
ForestAdmin · Jul 2, 2024 · d4c74e8 · d4c74e8
1 parent 1211211
commit d4c74e8
Showing 1 changed file with 9 additions and 6 deletions.
diff --git a/app/services/forest_liana/search_query_builder.rb b/app/services/forest_liana/search_query_builder.rb
@@ -104,14 +104,17 @@ def search_param
               end
               association_search = association_search.compact
             end
+
             if @includes.include? association.to_sym
               resource = @resource.reflect_on_association(association.to_sym)
-              resource.klass.columns.each do |column|
-                if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
-                  if @collection.search_fields.nil? || (association_search &&
-                    association_search.include?(column.name))
-                    conditions << association_search_condition(resource.table_name,
-                      column.name)
+              unless (SchemaUtils.polymorphic?(resource))
+                resource.klass.columns.each do |column|
+                  if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
+                    if @collection.search_fields.nil? || (association_search &&
+                      association_search.include?(column.name))
+                      conditions << association_search_condition(resource.table_name,
+                        column.name)
+                    end
                   end
                 end
               end