scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-04 02:45:53 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7573 from rekonder/aj_SCI_10722

Browse source 
Fix filtering archived results [SCI-10722]
This commit is contained in:
ajugo 2024-05-20 14:39:46 +02:00 • committed by GitHub
commit 28387ffdfd
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/models/result.rb
View file

@ -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