Skip to content

Commit d4c74e8

Browse files
fix(search): does not apply the extended search for polymorphic relationships (#684)
1 parent 1211211 commit d4c74e8

File tree

1 file changed

+9
-6
lines changed

1 file changed

+9
-6
lines changed

app/services/forest_liana/search_query_builder.rb

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -104,14 +104,17 @@ def search_param
104104
end
105105
association_search = association_search.compact
106106
end
107+
107108
if @includes.include? association.to_sym
108109
resource = @resource.reflect_on_association(association.to_sym)
109-
resource.klass.columns.each do |column|
110-
if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
111-
if @collection.search_fields.nil? || (association_search &&
112-
association_search.include?(column.name))
113-
conditions << association_search_condition(resource.table_name,
114-
column.name)
110+
unless (SchemaUtils.polymorphic?(resource))
111+
resource.klass.columns.each do |column|
112+
if !(column.respond_to?(:array) && column.array) && text_type?(column.type)
113+
if @collection.search_fields.nil? || (association_search &&
114+
association_search.include?(column.name))
115+
conditions << association_search_condition(resource.table_name,
116+
column.name)
117+
end
115118
end
116119
end
117120
end

0 commit comments

Comments
 (0)