Merge a1745d2 into 91912d1

griffithlab · Dec 23, 2019 · 2c1bac1 · 2c1bac1
2 parents 91912d1 + a1745d2
commit 2c1bac1
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/app/models/advanced_searches/base.rb b/app/models/advanced_searches/base.rb
@@ -12,8 +12,9 @@ def search
         query_segments.push(*additional_query_segments)
         param_values.push(*additional_param_values)
       end
-      query = model_class.advanced_search_scope
-        .where(query_segments.join(boolean_operator), *param_values)
+      ids = model_class.advanced_search_scope
+        .where(query_segments.join(boolean_operator), *param_values).pluck(:id)
+      query = model_class.advanced_search_scope.where("#{model_class.table_name}.id" => ids)
       if params['count'].present?
         query.order("#{model_class.table_name}.id asc")
         .page(params['page'])