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

Fix viewable scope for sharable models [SCI-11057]

Browse source
This commit is contained in:
Martin Artnik 2024-09-16 11:42:29 +02:00
parent bf1c446cc2
commit 30f9a911c2
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 = readable_by_user(user).left_outer_joins(:team_shared_objects)
readable readable
.where(team: teams) .where(team: teams)
.or(where(team_shared_objects: { team: teams })) .or(model.where(team_shared_objects: { team: teams }))
.or(where(if column_names.include?('permission_level') .or(model.where(if column_names.include?('permission_level')
{ {
permission_level: [ permission_level: [
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read], Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
@ -40,8 +40,7 @@ module Shareable
} }
else else
{} {}
end end).where.not(team: teams))
).where.not(team: teams))
.distinct .distinct
} }
rescue ActiveRecord::NoDatabaseError, rescue ActiveRecord::NoDatabaseError,