Merge pull request #2788 from urbanrotnik/ur-sci-4925-report-activities-fix

Fix activities query [SCI-4925]
This commit is contained in:
Urban Rotnik 2020-08-13 10:09:45 +02:00 committed by GitHub
commit 0c28b5d667
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -68,7 +68,7 @@ class ActivitiesService
end
def self.my_module_activities(my_module)
subjects_with_children = load_subjects_children(my_module: [my_module.id])
subjects_with_children = load_subjects_children('MyModule': [my_module.id])
query = Activity.where(project: my_module.experiment.project)
query.where(
subjects_with_children.map { '(subject_type = ? AND subject_id IN(?))' }.join(' OR '),