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

Browse source 
Simplify and fix shareable scope [SCI-11057]
This commit is contained in:
Martin Artnik 2024-09-18 15:09:10 +02:00 committed by GitHub
parent b9fd5148cf 1449b581f1
commit 926a9ee6d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 17 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -27,21 +27,23 @@ module Shareable
end
scope :viewable_by_user, lambda { |user, teams = user.current_team|
readable = readable_by_user(user).left_outer_joins(:team_shared_objects)
readable
.where(team: teams)
.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],
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]
]
}
else
{}
end).where.not(team: teams))
.distinct
readable_ids = readable_by_user(user).pluck(:id)
shared_with_team_ids = joins(:team_shared_objects, :team).where(team_shared_objects: { team: teams }).pluck(:id)
globally_shared_ids =
if column_names.include?('permission_level')
joins(:team).where(
{
permission_level: [
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read],
Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]
]
}
).pluck(:id)
else
none.pluck(:id)
end
where(id: (readable_ids + shared_with_team_ids + globally_shared_ids).uniq)
}
rescue ActiveRecord::NoDatabaseError,
ActiveRecord::ConnectionNotEstablished,