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

Fix activities service [SCI-5485]

Browse source
This commit is contained in:
aignatov-bio 2021-02-15 10:23:32 +01:00
parent 41cdc47702
commit 4f8e15dbc6
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
app/services/activities_service.rb
View file

@ -18,8 +18,8 @@ class ActivitiesService
query = query.where('project_id IN (?)', subjects_with_children['Project']) query = query.where('project_id IN (?)', subjects_with_children['Project'])
subjects_with_children.except!('Project') subjects_with_children.except!('Project')
end end
where_condition = subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR ') where_condition = subjects_with_children.to_h.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR ')
where_arguments = subjects_with_children.flatten where_arguments = subjects_with_children.to_h.flatten
if subjects_with_children[:my_module] if subjects_with_children[:my_module]
where_condition = where_condition.concat(' OR (my_module_id IN(?))') where_condition = where_condition.concat(' OR (my_module_id IN(?))')
where_arguments << subjects_with_children[:my_module] where_arguments << subjects_with_children[:my_module]
@ -71,8 +71,8 @@ class ActivitiesService
subjects_with_children = load_subjects_children('MyModule': [my_module.id]) subjects_with_children = load_subjects_children('MyModule': [my_module.id])
query = Activity.where(project: my_module.experiment.project) query = Activity.where(project: my_module.experiment.project)
query.where( query.where(
subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR '), subjects_with_children.to_h.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR '),
*subjects_with_children.flatten *subjects_with_children.to_h.flatten
) )
end end
end end