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

Merge pull request #7849 from artoscinote/ma_SCI_10865

Browse source 
Fix shareable scope [SCI-10865]
This commit is contained in:
Martin Artnik 2024-09-12 16:39:17 +02:00 committed by GitHub
commit eeee2f0d21
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 11 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,19 +30,17 @@ module Shareable
readable = readable_by_user(user).left_outer_joins(:team_shared_objects) readable = readable_by_user(user).left_outer_joins(:team_shared_objects)
readable readable
.where(team: teams) .where(team: teams)
.or(readable.where(team_shared_objects: { team: teams })) .or(where(team_shared_objects: { team: teams }))
.or(readable .or(where(if column_names.include?('permission_level')
.where( {
if column_names.include?('permission_level') permission_level: [
{ Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
permission_level: [ Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read], ]
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write] }
] else
} {}
else end
{}
end
).where.not(team: teams)) ).where.not(team: teams))
.distinct .distinct
} }