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

Include old activites assigned to the task [SCI-3285]

Browse source
This commit is contained in:
Oleksii Kriuchykhin 2019-04-02 18:37:55 +02:00
parent 3a2f78d7a8
commit 01ffb43c23
1 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/services/activities_service.rb
View file

@ -13,10 +13,13 @@ class ActivitiesService
query = query.where('project_id IN (?)', subjects_with_children[:Project])
subjects_with_children.except!(:Project)
end
query = query.where(
subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR '),
*subjects_with_children.flatten
)
where_condition = subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR ')
where_arguments = subjects_with_children.flatten
if subjects_with_children[:MyModule]
where_condition = where_condition.concat(' OR (my_module_id IN(?))')
where_arguments << subjects_with_children[:MyModule]
end
query = query.where(where_condition, *where_arguments)
end
query = query.where(owner_id: filters[:users]) if filters[:users]