From bbe0aa29ea488d5591d3403e15295dda625772fc Mon Sep 17 00:00:00 2001 From: ajugo Date: Wed, 23 Aug 2023 18:05:20 +0200 Subject: [PATCH] Fix showing of project folder toolbar buttons [SCI-9099] (#6053) * Fix showing of project folder toolbar buttons [SCI-9099] * Fix reading permission for all projects for team admins [SCI-9099] * Fix check for team admin [SCI-9099] --- app/services/toolbars/projects_service.rb | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/app/services/toolbars/projects_service.rb b/app/services/toolbars/projects_service.rb index 9502f68fd..1ea1733fc 100644 --- a/app/services/toolbars/projects_service.rb +++ b/app/services/toolbars/projects_service.rb @@ -16,9 +16,6 @@ module Toolbars @single = @items.length == 1 - @team_owner = @current_user.current_team.user_assignments.exists?(user: @current_user, user_role: UserRole.find_predefined_owner_role) - @unassigned_team_owner = @team_owner && !can_read_project?(@items.first) - @item_type = if project_ids.blank? && project_folder_ids.blank? :none elsif project_ids.present? && project_folder_ids.present? @@ -32,7 +29,6 @@ module Toolbars def actions return [] if @item_type == :none - return [access_action] if @unassigned_team_owner [ restore_action, @@ -88,7 +84,7 @@ module Toolbars project = @items.first - return unless @team_owner || can_read_project?(project) + return unless can_manage_team?(project.team) || can_read_project?(project) path = if can_manage_project_users?(project) edit_access_permissions_project_path(project) @@ -107,7 +103,8 @@ module Toolbars end def move_action - return unless can_manage_team?(@items.first.team) + return unless can_manage_team?(@items.first.team) && + @items.all? { |item| item.is_a?(Project) ? can_read_project?(item) : true } { name: 'move',