scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-03-04 11:46:25 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7770 from artoscinote/ma_SCI_10939

Browse source 
Fix result filtering [SCI-10939]
This commit is contained in:
Martin Artnik 2024-07-31 14:52:02 +02:00 committed by GitHub
commit 461075a720
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/models/result.rb
View file

@ -42,12 +42,12 @@ class Result < ApplicationRecord
options = {}) options = {})
teams = options[:teams] || current_team || user.teams.select(:id) teams = options[:teams] || current_team || user.teams.select(:id)
new_query = distinct.left_joins(:result_comments, :result_texts, result_tables: :table) new_query = left_joins(:result_comments, :result_texts, result_tables: :table)
.joins(:my_module) .joins(:my_module)
.joins("INNER JOIN user_assignments my_module_user_assignments " \ .joins("INNER JOIN user_assignments my_module_user_assignments " \
"ON my_module_user_assignments.assignable_type = 'MyModule' " \ "ON my_module_user_assignments.assignable_type = 'MyModule' " \
"AND my_module_user_assignments.assignable_id = my_modules.id") "AND my_module_user_assignments.assignable_id = my_modules.id")
.where(my_module_user_assignments: { user_id: user, team_id: teams }) .where(my_module_user_assignments: { user_id: user, team_id: teams })
unless include_archived unless include_archived
new_query = new_query.joins(my_module: { experiment: :project }) new_query = new_query.joins(my_module: { experiment: :project })
@ -57,7 +57,9 @@ class Result < ApplicationRecord
projects: { archived: false }) projects: { archived: false })
end end
new_query.where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, { with_subquery: true, raw_input: new_query }) new_query.where_attributes_like_boolean(
SEARCHABLE_ATTRIBUTES, query, { with_subquery: true, raw_input: new_query }
).distinct
end end
def self.search_subquery(query, raw_input) def self.search_subquery(query, raw_input)