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

Fix shareable scope [SCI-10865]

Browse source
This commit is contained in:
Martin Artnik 2024-09-12 16:24:46 +02:00
parent 2039a65e9b
commit c4b3b10429
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
} }