From 157a23d025a36d9538e67c7da562218f6823f23e Mon Sep 17 00:00:00 2001 From: Martin Artnik Date: Mon, 16 Sep 2024 11:42:29 +0200 Subject: [PATCH] Fix viewable scope for sharable models [SCI-11057] --- app/models/concerns/shareable.rb | 23 +++++++++++------------ 1 file changed, 11 insertions(+), 12 deletions(-) diff --git a/app/models/concerns/shareable.rb b/app/models/concerns/shareable.rb index 6f157766e..3f94a0770 100644 --- a/app/models/concerns/shareable.rb +++ b/app/models/concerns/shareable.rb @@ -30,18 +30,17 @@ module Shareable readable = readable_by_user(user).left_outer_joins(:team_shared_objects) readable .where(team: teams) - .or(where(team_shared_objects: { team: teams })) - .or(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)) + .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 } rescue ActiveRecord::NoDatabaseError,