scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2024-09-20 06:35:56 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7809 from artoscinote/ma_SCI_10988

Browse source 
Properly handle experiments with hidden tasks in navigator [SCI-10988]
This commit is contained in:
Martin Artnik 2024-08-21 11:09:35 +02:00 committed by GitHub
parent b380a009d8 531cdbf23c
commit e7b4fd0151
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app/models/experiment.rb
View file

@ -84,6 +84,8 @@ class Experiment < ApplicationRecord
end
def self.with_children_viewable_by_user(user)
# the NONE permission at the end also allows for experiments with hidden tasks (virtually empty)
# to show up on the list
joins("
LEFT OUTER JOIN my_modules ON my_modules.experiment_id = experiments.id
LEFT OUTER JOIN user_assignments my_module_user_assignments
@ -94,8 +96,8 @@ class Experiment < ApplicationRecord
")
.where('
(my_module_user_assignments.user_id = ? AND my_module_user_roles.permissions @> ARRAY[?]::varchar[]
OR my_modules.id IS NULL)
', user.id, MyModulePermissions::READ)
OR my_modules.id IS NULL OR my_module_user_roles.permissions @> ARRAY[?]::varchar[])
', user.id, MyModulePermissions::READ, MyModulePermissions::NONE)
end
def self.filter_by_teams(teams = [])