diff --git a/app/models/result.rb b/app/models/result.rb index 8bce5112f..167a58f94 100644 --- a/app/models/result.rb +++ b/app/models/result.rb @@ -49,7 +49,13 @@ class Result < ApplicationRecord "AND my_module_user_assignments.assignable_id = my_modules.id") .where(my_module_user_assignments: { user_id: user, team_id: teams }) - new_query = new_query.active unless include_archived + unless include_archived + new_query = new_query.joins(my_module: { experiment: :project }) + .active + .where(my_modules: { archived: false }, + experiments: { archived: false }, + projects: { archived: false }) + end new_query.where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, { with_subquery: true, raw_input: new_query }) end