scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-09-10 15:14:33 +08:00
Code Issues Projects Releases Packages Wiki Activity

Merge pull request #8799 from artoscinote/ma_SCI_12224

Browse source 
Fix ambiguous column error in activities_service [SCI-12224]
This commit is contained in:
Martin Artnik 2025-08-14 14:36:00 +02:00 • committed by GitHub
commit 3169cbb232
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/activities_service.rb
View file

@ -22,13 +22,13 @@ class ActivitiesService
activities = activities =
if filters[:from_date].present? && filters[:to_date].present? if filters[:from_date].present? && filters[:to_date].present?
activities.where('created_at <= :from AND created_at >= :to', activities.where('activities.created_at <= :from AND activities.created_at >= :to',
from: Time.zone.parse(filters[:from_date]).end_of_day.utc, from: Time.zone.parse(filters[:from_date]).end_of_day.utc,
to: Time.zone.parse(filters[:to_date]).beginning_of_day.utc) to: Time.zone.parse(filters[:to_date]).beginning_of_day.utc)
elsif filters[:from_date].present? && filters[:to_date].blank? elsif filters[:from_date].present? && filters[:to_date].blank?
activities.where('created_at <= :from', from: Time.zone.parse(filters[:from_date]).end_of_day.utc) activities.where('activities.created_at <= :from', from: Time.zone.parse(filters[:from_date]).end_of_day.utc)
elsif filters[:from_date].blank? && filters[:to_date].present? elsif filters[:from_date].blank? && filters[:to_date].present?
activities.where(created_at: Time.zone.parse(filters[:to_date]).beginning_of_day.utc..) activities.where('activities.created_at' => Time.zone.parse(filters[:to_date]).beginning_of_day.utc..)
else else
activities activities
end end