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 #7854 from artoscinote/ma_SCI_11057

Browse source 
Fix viewable scope for sharable models [SCI-11057]
This commit is contained in:
Martin Artnik 2024-09-16 11:48:44 +02:00 committed by GitHub
parent bf1c446cc2 30f9a911c2
commit 1d4e9077cc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/models/concerns/shareable.rb
View file

@ -30,8 +30,8 @@ module Shareable
readable = readable_by_user(user).left_outer_joins(:team_shared_objects)
readable
.where(team: teams)
.or(where(team_shared_objects: { team: teams }))
.or(where(if column_names.include?('permission_level')
.or(model.where(team_shared_objects: { team: teams }))
.or(model.where(if column_names.include?('permission_level')
{
permission_level: [
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
@ -40,8 +40,7 @@ module Shareable
}
else
{}
end
).where.not(team: teams))
end).where.not(team: teams))
.distinct
}
rescue ActiveRecord::NoDatabaseError,