From ec2e70ae3aa2fc4fd7d7af866cc8951f765f7aa6 Mon Sep 17 00:00:00 2001 From: Andrej Date: Mon, 13 May 2024 10:31:00 +0200 Subject: [PATCH] Fix links for repository row global search results [SCI-10690] --- app/models/concerns/permission_checkable_model.rb | 2 +- app/serializers/global_search/repository_row_serializer.rb | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/models/concerns/permission_checkable_model.rb b/app/models/concerns/permission_checkable_model.rb index aaaf769e9..04a84777d 100644 --- a/app/models/concerns/permission_checkable_model.rb +++ b/app/models/concerns/permission_checkable_model.rb @@ -7,7 +7,7 @@ module PermissionCheckableModel include PermissionExtends scope :with_granted_permissions, lambda { |user, permissions| - left_outer_joins(user_assignments: :user_role) + joins(user_assignments: :user_role) .where(user_assignments: { user: user }) .where('user_roles.permissions @> ARRAY[?]::varchar[]', permissions) } diff --git a/app/serializers/global_search/repository_row_serializer.rb b/app/serializers/global_search/repository_row_serializer.rb index 8cbf8ce2a..0ee467a3d 100644 --- a/app/serializers/global_search/repository_row_serializer.rb +++ b/app/serializers/global_search/repository_row_serializer.rb @@ -7,9 +7,10 @@ module GlobalSearch attributes :id, :name, :code, :created_at, :created_by, :team, :repository, :archived, :url def team + team = object.repository.shared_with?(current_user.current_team) ? current_user.current_team : object.team { - name: object.team.name, - url: dashboard_path(team: object.team) + name: team.name, + url: dashboard_path(team: team) } end