scinote-eln/scinote-web
1
1
Fork 0
mirror of https://github.com/scinote-eln/scinote-web.git synced 2025-02-24 15:54:00 +08:00
Code Issues Projects Releases Packages Wiki Activity

Fix folders display in the navigator [SCI-8542] (#5496)

Browse source
This commit is contained in:
Alex Kriuchykhin 2023-05-29 11:49:39 +02:00 committed by GitHub
parent 2e9fe37040
commit d4afd5be8f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
app/controllers/navigator/base_controller.rb
View file

@ -93,24 +93,22 @@ module Navigator
end end
def fetch_project_folders(object = nil, archived = false) def fetch_project_folders(object = nil, archived = false)
folder = if object&.is_a?(ProjectFolder) folder = if object.is_a?(ProjectFolder)
object object
else else
object&.project_folder object&.project_folder
end end
current_team.project_folders.where(parent_folder: folder) current_team.project_folders.where(parent_folder: folder)
.left_outer_joins(projects: { user_assignments: :user_role }, project_folders: {}) .left_outer_joins(:projects, project_folders: {})
.where(project_folders: { archived: archived }) .joins(
.where(' "LEFT OUTER JOIN (#{Project.viewable_by_user(current_user, current_team).to_sql}) " \
user_assignments.user_id = ? AND "viewable_projects ON viewable_projects.project_folder_id = project_folders.id"
user_roles.permissions @> ARRAY[?]::varchar[] OR )
projects.id IS NULL
', current_user.id, ProjectPermissions::READ)
.select( .select(
'project_folders.id', 'project_folders.id',
'project_folders.name', 'project_folders.name',
'project_folders.archived', 'project_folders.archived',
'SUM(CASE WHEN projects.id IS NOT NULL OR project_folders_project_folders.id IS NOT NULL 'SUM(CASE WHEN viewable_projects.id IS NOT NULL OR project_folders_project_folders.id IS NOT NULL
THEN 1 ELSE 0 END) > 0 AS has_children' THEN 1 ELSE 0 END) > 0 AS has_children'
).group('project_folders.id') ).group('project_folders.id')
end end