scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-10-01 17:34:59 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix showing of project folder toolbar buttons [SCI-9099] (#6053)

Browse source 
* 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]
This commit is contained in:
ajugo 2023-08-23 18:05:20 +02:00 • committed by GitHub
parent 207af995af
commit bbe0aa29ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
app/services/toolbars/projects_service.rb
View file

@ -16,9 +16,6 @@ module Toolbars
@single = @items.length == 1 @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? @item_type = if project_ids.blank? && project_folder_ids.blank?
:none :none
elsif project_ids.present? && project_folder_ids.present? elsif project_ids.present? && project_folder_ids.present?
@ -32,7 +29,6 @@ module Toolbars
def actions def actions
return [] if @item_type == :none return [] if @item_type == :none
return [access_action] if @unassigned_team_owner
[ [
restore_action, restore_action,
@ -88,7 +84,7 @@ module Toolbars
project = @items.first 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) path = if can_manage_project_users?(project)
edit_access_permissions_project_path(project) edit_access_permissions_project_path(project)
@ -107,7 +103,8 @@ module Toolbars
end end
def move_action 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', name: 'move',