scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-11-13 01:41:09 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #7608 from scinote-eln/hotfix/1.33.0.1

Browse source 
Hotfix/1.33.0.1
This commit is contained in:
Martin Artnik 2024-05-30 10:31:20 +02:00 • committed by GitHub
commit e80d43c759
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/services/lists/protocols_service.rb
View file

@ -10,14 +10,14 @@ module Lists
original_without_versions = @raw_data original_without_versions = @raw_data
.where.missing(:published_versions) .where.missing(:published_versions)
.in_repository_published_original .in_repository_published_original
.select(:id) .select('protocols.id')
published_versions = @raw_data published_versions = @raw_data
.in_repository_published_version .in_repository_published_version
.order(:parent_id, version_number: :desc) .order(:parent_id, version_number: :desc)
.select('DISTINCT ON (parent_id) id') .select('DISTINCT ON (protocols.parent_id) protocols.id')
new_drafts = @raw_data new_drafts = @raw_data
.where(protocol_type: Protocol.protocol_types[:in_repository_draft], parent_id: nil) .where(protocol_type: Protocol.protocol_types[:in_repository_draft], parent_id: nil)
.select(:id) .select('protocols.id')
@records = Protocol.where('protocols.id IN (?) OR protocols.id IN (?) OR protocols.id IN (?)', @records = Protocol.where('protocols.id IN (?) OR protocols.id IN (?) OR protocols.id IN (?)',
original_without_versions, published_versions, new_drafts) original_without_versions, published_versions, new_drafts)