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

Merge pull request #7526 from rekonder/aj_SCI_10655

Browse source 
Add missing fields for global search for protocols [SCI-10655]
This commit is contained in:
ajugo 2024-05-06 10:48:51 +02:00 committed by GitHub
commit c7870addda
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
app/models/protocol.rb
View file

@ -5,9 +5,9 @@ class Protocol < ApplicationRecord
include ArchivableModel include ArchivableModel
include PrefixedIdModel include PrefixedIdModel
SEARCHABLE_ATTRIBUTES = ['protocols.name', 'protocols.description', SEARCHABLE_ATTRIBUTES = ['protocols.name', 'protocols.description', PREFIXED_ID_SQL, 'steps.name',
'step_texts.name', 'step_texts.text', 'tables.name', 'step_texts.name', 'step_texts.text', 'tables.name',
'checklists.name', 'checklist_items.text', PREFIXED_ID_SQL].freeze 'checklists.name', 'checklist_items.text', 'comments.message'].freeze
REPOSITORY_TYPES = %i(in_repository_published_original in_repository_draft in_repository_published_version).freeze REPOSITORY_TYPES = %i(in_repository_published_original in_repository_draft in_repository_published_version).freeze
include SearchableModel include SearchableModel
@ -189,11 +189,11 @@ class Protocol < ApplicationRecord
protocols.pluck(:id) protocols.pluck(:id)
end || [] end || []
distinct.where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))', distinct.left_joins(steps: [:step_texts, { step_tables: :table },
{ checklists: :checklist_items }, :step_comments])
.where('(protocols.protocol_type IN (?) AND protocols.my_module_id IN (?)) OR (protocols.id IN (?))',
[Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]], [Protocol.protocol_types[:unlinked], Protocol.protocol_types[:linked]],
protocol_my_modules, protocol_templates) protocol_my_modules, protocol_templates)
.left_outer_joins(steps: [:step_texts, { step_tables: :table },
{ checklists: :checklist_items }, :step_comments])
.where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options) .where_attributes_like_boolean(SEARCHABLE_ATTRIBUTES, query, options)
end end