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

Merge pull request #7802 from okriuchykhin/ok_SCI_10991_v2

Browse source 
Fix listing of globally shared inventories [SCI-10991]
This commit is contained in:
Martin Artnik 2024-08-20 12:15:51 +02:00 committed by GitHub
commit 3c877625ed
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 5 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
app/models/repository.rb
View file

@ -49,16 +49,12 @@ class Repository < RepositoryBase
scope :globally_shared, -> { where(permission_level: %i(shared_read shared_write)) } scope :globally_shared, -> { where(permission_level: %i(shared_read shared_write)) }
scope :viewable_by_user, lambda { |user, teams = user.current_team| scope :viewable_by_user, lambda { |user, teams = user.current_team|
readable_repositories = joins(user_assignments: :user_role) readable_repositories = readable_by_user(user)
.left_outer_joins(:team_shared_objects)
.where(team: teams)
readable_repositories =
readable_repositories readable_repositories
.where(user_assignments: { user: user }) .where(team: teams)
.where('? = ANY(user_roles.permissions)', RepositoryPermissions::READ)
.or(readable_repositories .or(readable_repositories
.where(permission_level: [Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read], Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]])) .where(permission_level: [Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_read], Extends::SHARED_OBJECTS_PERMISSION_LEVELS[:shared_write]])
readable_repositories.distinct .where.not(team: teams))
} }
scope :assigned_to_project, lambda { |project| scope :assigned_to_project, lambda { |project|